diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:17:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:17:25 -0400 |
commit | 64c4813d9ea0d646a0652bd9dcc5b40db6ddce69 (patch) | |
tree | 98658d9009182e79cb443cef67afbdc4bb3b8a48 /drivers/pcmcia/sa1111_generic.c | |
parent | babf68de5848f7e4b97c9c4a2d5e30598b825387 (diff) | |
parent | 664399e1fbdceb18da9c9c5534dedd62327c63e8 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/pcmcia/sa1111_generic.c')
-rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index b441f43a6a55..bb90a1448a53 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
@@ -189,7 +189,7 @@ static void __exit sa1111_drv_pcmcia_exit(void) | |||
189 | sa1111_driver_unregister(&pcmcia_driver); | 189 | sa1111_driver_unregister(&pcmcia_driver); |
190 | } | 190 | } |
191 | 191 | ||
192 | module_init(sa1111_drv_pcmcia_init); | 192 | fs_initcall(sa1111_drv_pcmcia_init); |
193 | module_exit(sa1111_drv_pcmcia_exit); | 193 | module_exit(sa1111_drv_pcmcia_exit); |
194 | 194 | ||
195 | MODULE_DESCRIPTION("SA1111 PCMCIA card socket driver"); | 195 | MODULE_DESCRIPTION("SA1111 PCMCIA card socket driver"); |