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/bfin_cf_pcmcia.c | |
| parent | ef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5 (diff) | |
| parent | 80af9e6d7ae633309cc5bca96aee6a45117e7c98 (diff) | |
| download | op-kernel-dev-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.zip op-kernel-dev-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.tar.gz | |
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/bfin_cf_pcmcia.c')
| -rw-r--r-- | drivers/pcmcia/bfin_cf_pcmcia.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c index 4922139..ac1a223 100644 --- a/drivers/pcmcia/bfin_cf_pcmcia.c +++ b/drivers/pcmcia/bfin_cf_pcmcia.c @@ -310,18 +310,7 @@ static struct platform_driver bfin_cf_driver = { .remove = __devexit_p(bfin_cf_remove), }; -static int __init bfin_cf_init(void) -{ - return platform_driver_register(&bfin_cf_driver); -} - -static void __exit bfin_cf_exit(void) -{ - platform_driver_unregister(&bfin_cf_driver); -} - -module_init(bfin_cf_init); -module_exit(bfin_cf_exit); +module_platform_driver(bfin_cf_driver); MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); |
