Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / mmc / host / sdricoh_cs.c

diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index 7aa65bb2af4a29cc03231589de9083e48589b66f..f472c2714eb88a4289598ed9e454e7aefceaac45 100644 (file)
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -30,7 +30,6 @@
 #include <linux/ioport.h>
 #include <linux/scatterlist.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 #include <linux/io.h>
@@ -536,9 +535,7 @@ static int sdricoh_pcmcia_resume(struct pcmcia_device *link)
 #endif
 
 static struct pcmcia_driver sdricoh_driver = {
-       .drv = {
-               .name = DRIVER_NAME,
-               },
+       .name = DRIVER_NAME,
        .probe = sdricoh_pcmcia_probe,
        .remove = sdricoh_pcmcia_detach,
        .id_table = pcmcia_ids,