diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 00:26:26 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 00:26:26 +0400 |
| commit | 64b3dcc35e8dcaa3032aa6aba416d05f41ead959 (patch) | |
| tree | a9b16f5cef9ec006061b284fcf79645a7d89cbff /drivers/sbus/char/flash.c | |
| parent | 24545cf168d1128bd74dfe6ea9e864825e25dd02 (diff) | |
| parent | b1f44e13a525d2ffb7d5afe2273b7169d6f2222e (diff) | |
| download | linux-64b3dcc35e8dcaa3032aa6aba416d05f41ead959.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc32: Be less strict in matching %lo part of relocation.
sbus: convert drivers/sbus/char/* to use module_platform_driver()
bbc_i2c: Remove unneeded err variable
sparc: Use kmemdup rather than duplicating its implementation
Diffstat (limited to 'drivers/sbus/char/flash.c')
| -rw-r--r-- | drivers/sbus/char/flash.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 73dd4e7afaaa..826157f38694 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -216,16 +216,6 @@ static struct platform_driver flash_driver = { .remove = __devexit_p(flash_remove), }; -static int __init flash_init(void) -{ - return platform_driver_register(&flash_driver); -} - -static void __exit flash_cleanup(void) -{ - platform_driver_unregister(&flash_driver); -} +module_platform_driver(flash_driver); -module_init(flash_init); -module_exit(flash_cleanup); MODULE_LICENSE("GPL"); |