diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/pcmcia/electra_cf.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/pcmcia/electra_cf.c')
| -rw-r--r-- | drivers/pcmcia/electra_cf.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index 06ad3e5e7d3d..7647d232e9e2 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c | |||
| @@ -365,17 +365,7 @@ static struct platform_driver electra_cf_driver = { | |||
| 365 | .remove = electra_cf_remove, | 365 | .remove = electra_cf_remove, |
| 366 | }; | 366 | }; |
| 367 | 367 | ||
| 368 | static int __init electra_cf_init(void) | 368 | module_platform_driver(electra_cf_driver); |
| 369 | { | ||
| 370 | return platform_driver_register(&electra_cf_driver); | ||
| 371 | } | ||
| 372 | module_init(electra_cf_init); | ||
| 373 | |||
| 374 | static void __exit electra_cf_exit(void) | ||
| 375 | { | ||
| 376 | platform_driver_unregister(&electra_cf_driver); | ||
| 377 | } | ||
| 378 | module_exit(electra_cf_exit); | ||
| 379 | 369 | ||
| 380 | MODULE_LICENSE("GPL"); | 370 | MODULE_LICENSE("GPL"); |
| 381 | MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>"); | 371 | MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>"); |