diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 08:38:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 08:38:23 +0100 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/input/keyboard/davinci_keyscan.c | |
| parent | Input: sentelic - fix retrieving number of buttons (diff) | |
| parent | Input: tc3589x-keypad - add missing kerneldoc (diff) | |
| download | linux-da733563be5a9da26fe81d9f007262d00b846e22.tar.xz linux-da733563be5a9da26fe81d9f007262d00b846e22.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/keyboard/davinci_keyscan.c')
| -rw-r--r-- | drivers/input/keyboard/davinci_keyscan.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c index 9d82b3aeff5e..469825247552 100644 --- a/drivers/input/keyboard/davinci_keyscan.c +++ b/drivers/input/keyboard/davinci_keyscan.c @@ -328,18 +328,7 @@ static struct platform_driver davinci_ks_driver = { }, .remove = __devexit_p(davinci_ks_remove), }; - -static int __init davinci_ks_init(void) -{ - return platform_driver_probe(&davinci_ks_driver, davinci_ks_probe); -} -module_init(davinci_ks_init); - -static void __exit davinci_ks_exit(void) -{ - platform_driver_unregister(&davinci_ks_driver); -} -module_exit(davinci_ks_exit); +module_platform_driver(davinci_ks_driver); MODULE_AUTHOR("Miguel Aguilar"); MODULE_DESCRIPTION("Texas Instruments DaVinci Key Scan Driver"); |