Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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..6d441ec 100644 (file)
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -33,14 +33,18 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/config.h>
+#include <linux/platform_device.h>
 
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
 
+#include <asm/hardware/scoop.h>
+
 #include "sa1100_generic.h"
 
+int __init pcmcia_collie_init(struct device *dev);
+
 static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
 #ifdef CONFIG_SA1100_ASSABET
        pcmcia_assabet_init,
@@ -48,35 +52,17 @@ 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,
+#ifdef CONFIG_SA1100_COLLIE
+       pcmcia_collie_init,
 #endif
 };
 
@@ -96,29 +82,13 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev)
        return ret;
 }
 
-static int sa11x0_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level)
-{
-       int ret = 0;
-       if (level == SUSPEND_SAVE_STATE)
-               ret = pcmcia_socket_dev_suspend(dev, state);
-       return ret;
-}
-
-static int sa11x0_drv_pcmcia_resume(struct device *dev, u32 level)
-{
-       int ret = 0;
-       if (level == RESUME_RESTORE_STATE)
-               ret = pcmcia_socket_dev_resume(dev);
-       return ret;
-}
-
 static struct device_driver sa11x0_pcmcia_driver = {
        .probe          = sa11x0_drv_pcmcia_probe,
        .remove         = soc_common_drv_pcmcia_remove,
        .name           = "sa11x0-pcmcia",
        .bus            = &platform_bus_type,
-       .suspend        = sa11x0_drv_pcmcia_suspend,
-       .resume         = sa11x0_drv_pcmcia_resume,
+       .suspend        = pcmcia_socket_dev_suspend,
+       .resume         = pcmcia_socket_dev_resume,
 };
 
 /* sa11x0_pcmcia_init()
@@ -148,5 +118,5 @@ MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");
 MODULE_DESCRIPTION("Linux PCMCIA Card Services: SA-11x0 Socket Controller");
 MODULE_LICENSE("Dual MPL/GPL");
 
-module_init(sa11x0_pcmcia_init);
+fs_initcall(sa11x0_pcmcia_init);
 module_exit(sa11x0_pcmcia_exit);