diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 16:00:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 16:00:48 -0700 |
| commit | a6f707b601c3f85d4b816ea08a757ea1af4f1cc0 (patch) | |
| tree | 86cea1675e515c6baca64cea812ebe2ccc6aa955 /drivers/pcmcia/pxa2xx_viper.c | |
| parent | ef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5 (diff) | |
| parent | 80af9e6d7ae633309cc5bca96aee6a45117e7c98 (diff) | |
| download | linux-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.tar.bz2 | |
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/pxa2xx_viper.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_viper.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c index adfae4987a42..cb0c37ec7f24 100644 --- a/drivers/pcmcia/pxa2xx_viper.c +++ b/drivers/pcmcia/pxa2xx_viper.c @@ -177,18 +177,7 @@ static struct platform_driver viper_pcmcia_driver = { .id_table = viper_pcmcia_id_table, }; -static int __init viper_pcmcia_init(void) -{ - return platform_driver_register(&viper_pcmcia_driver); -} - -static void __exit viper_pcmcia_exit(void) -{ - return platform_driver_unregister(&viper_pcmcia_driver); -} - -module_init(viper_pcmcia_init); -module_exit(viper_pcmcia_exit); +module_platform_driver(viper_pcmcia_driver); MODULE_DEVICE_TABLE(platform, viper_pcmcia_id_table); MODULE_LICENSE("GPL"); |