diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 01:00:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 01:00:48 +0200 |
| commit | a6f707b601c3f85d4b816ea08a757ea1af4f1cc0 (patch) | |
| tree | 86cea1675e515c6baca64cea812ebe2ccc6aa955 /drivers/pcmcia/xxs1500_ss.c | |
| parent | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | pcmcia at91_cf: fix raw gpio number usage (diff) | |
| download | linux-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.tar.xz linux-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
Pull a few PCMCIA updates from Dominik Brodowski.
Fix up trivial conflict (modified code in question had been removed) in
drivers/pcmcia/soc_common.c.
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
pcmcia at91_cf: fix raw gpio number usage
ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
pcmcia: irq: Remove IRQF_DISABLED
Diffstat (limited to 'drivers/pcmcia/xxs1500_ss.c')
| -rw-r--r-- | drivers/pcmcia/xxs1500_ss.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index 8f6698074f8e..fd5fbd10aad0 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c @@ -320,18 +320,7 @@ static struct platform_driver xxs1500_pcmcia_socket_driver = { .remove = __devexit_p(xxs1500_pcmcia_remove), }; -int __init xxs1500_pcmcia_socket_load(void) -{ - return platform_driver_register(&xxs1500_pcmcia_socket_driver); -} - -void __exit xxs1500_pcmcia_socket_unload(void) -{ - platform_driver_unregister(&xxs1500_pcmcia_socket_driver); -} - -module_init(xxs1500_pcmcia_socket_load); -module_exit(xxs1500_pcmcia_socket_unload); +module_platform_driver(xxs1500_pcmcia_socket_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("PCMCIA Socket Services for MyCable XXS1500 systems"); |