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
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
/
sa1111_generic.c
diff --git
a/drivers/pcmcia/sa1111_generic.c
b/drivers/pcmcia/sa1111_generic.c
index
bd9d6b2
..
81ded52
100644
(file)
--- a/
drivers/pcmcia/sa1111_generic.c
+++ b/
drivers/pcmcia/sa1111_generic.c
@@
-122,7
+122,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)))
@@
-158,7
+158,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);
}
@@
-189,7
+189,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");