Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / pcmcia / electra_cf.c

diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 1b206eac5f93be86ffe61d07bf420d2234a79cae..5ea64d0f61abf87bd6c7767083b2dec4e52447fc 100644 (file)
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -359,7 +359,7 @@ MODULE_DEVICE_TABLE(of, electra_cf_match);
 
 static struct platform_driver electra_cf_driver = {
        .driver = {
-               .name = (char *)driver_name,
+               .name = driver_name,
                .owner = THIS_MODULE,
                .of_match_table = electra_cf_match,
        },