X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fpcmcia%2Fsa1111_generic.c;h=bd9d6b2fad687f392b7d2dcf4bfe8839b865c831;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=c8e0551cdb20e2aa63fb8d981808acbf8cdcca47;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index c8e0551cd..bd9d6b2fa 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -136,15 +136,9 @@ static int pcmcia_probe(struct sa1111_dev *dev)
 	sa1111_writel(PCSSR_S0_SLEEP | PCSSR_S1_SLEEP, base + SA1111_PCSSR);
 	sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + SA1111_PCCR);
 
-#ifdef CONFIG_SA1100_ADSBITSY
-	pcmcia_adsbitsy_init(&dev->dev);
-#endif
 #ifdef CONFIG_SA1100_BADGE4
 	pcmcia_badge4_init(&dev->dev);
 #endif
-#ifdef CONFIG_SA1100_GRAPHICSMASTER
-	pcmcia_graphicsmaster_init(&dev->dev);
-#endif
 #ifdef CONFIG_SA1100_JORNADA720
 	pcmcia_jornada720_init(&dev->dev);
 #endif
@@ -153,15 +147,6 @@ static int pcmcia_probe(struct sa1111_dev *dev)
 #endif
 #ifdef CONFIG_ASSABET_NEPONSET
 	pcmcia_neponset_init(dev);
-#endif
-#ifdef CONFIG_SA1100_PFS168
-	pcmcia_pfs_init(&dev->dev);
-#endif
-#ifdef CONFIG_SA1100_PT_SYSTEM3
-	pcmcia_system3_init(&dev->dev);
-#endif
-#ifdef CONFIG_SA1100_XP860
-	pcmcia_xp860_init(&dev->dev);
 #endif
 	return 0;
 }