vserver 1.9.5.x5

[linux-2.6.git] / drivers / pcmcia / sa1100_generic.c

diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 0efa9c6..874990e 100644 (file)
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -48,36 +48,15 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
 #ifdef CONFIG_SA1100_CERF
        pcmcia_cerf_init,
 #endif
-#ifdef CONFIG_SA1100_FLEXANET
-       pcmcia_flexanet_init,
-#endif
-#ifdef CONFIG_SA1100_FREEBIRD
-       pcmcia_freebird_init,
-#endif
-#ifdef CONFIG_SA1100_GRAPHICSCLIENT
-       pcmcia_gcplus_init,
-#endif
 #ifdef CONFIG_SA1100_H3600
        pcmcia_h3600_init,
 #endif
-#ifdef CONFIG_SA1100_PANGOLIN
-       pcmcia_pangolin_init,
-#endif
 #ifdef CONFIG_SA1100_SHANNON
        pcmcia_shannon_init,
 #endif
 #ifdef CONFIG_SA1100_SIMPAD
        pcmcia_simpad_init,
 #endif
-#ifdef CONFIG_SA1100_STORK
-       pcmcia_stork_init,
-#endif
-#ifdef CONFIG_SA1100_TRIZEPS
-       pcmcia_trizeps_init,
-#endif
-#ifdef CONFIG_SA1100_YOPY
-       pcmcia_yopy_init,
-#endif
 };
 
 static int sa11x0_drv_pcmcia_probe(struct device *dev)