git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
pcmcia
/
sa1111_generic.c
diff --git
a/drivers/pcmcia/sa1111_generic.c
b/drivers/pcmcia/sa1111_generic.c
index
c8e0551
..
658cddf
100644
(file)
--- a/
drivers/pcmcia/sa1111_generic.c
+++ b/
drivers/pcmcia/sa1111_generic.c
@@
-5,7
+5,6
@@
* basically means we handle everything except controlling the
* power. Power is machine specific...
*/
* basically means we handle everything except controlling the
* power. Power is machine specific...
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/ioport.h>
@@
-122,7
+121,7
@@
void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
static int pcmcia_probe(struct sa1111_dev *dev)
{
static int pcmcia_probe(struct sa1111_dev *dev)
{
-
char
*base;
+
void __iomem
*base;
if (!request_mem_region(dev->res.start, 512,
SA1111_DRIVER_NAME(dev)))
if (!request_mem_region(dev->res.start, 512,
SA1111_DRIVER_NAME(dev)))
@@
-136,15
+135,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);
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_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
#ifdef CONFIG_SA1100_JORNADA720
pcmcia_jornada720_init(&dev->dev);
#endif
@@
-153,15
+146,6
@@
static int pcmcia_probe(struct sa1111_dev *dev)
#endif
#ifdef CONFIG_ASSABET_NEPONSET
pcmcia_neponset_init(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;
}
#endif
return 0;
}
@@
-173,7
+157,7
@@
static int __devexit pcmcia_remove(struct sa1111_dev *dev)
return 0;
}
return 0;
}
-static int pcmcia_suspend(struct sa1111_dev *dev,
u32
state)
+static int pcmcia_suspend(struct sa1111_dev *dev,
pm_message_t
state)
{
return pcmcia_socket_dev_suspend(&dev->dev, state);
}
{
return pcmcia_socket_dev_suspend(&dev->dev, state);
}
@@
-204,7
+188,7
@@
static void __exit sa1111_drv_pcmcia_exit(void)
sa1111_driver_unregister(&pcmcia_driver);
}
sa1111_driver_unregister(&pcmcia_driver);
}
-
module_init
(sa1111_drv_pcmcia_init);
+
fs_initcall
(sa1111_drv_pcmcia_init);
module_exit(sa1111_drv_pcmcia_exit);
MODULE_DESCRIPTION("SA1111 PCMCIA card socket driver");
module_exit(sa1111_drv_pcmcia_exit);
MODULE_DESCRIPTION("SA1111 PCMCIA card socket driver");