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/serio/at32psif.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/serio/at32psif.c')
| -rw-r--r-- | drivers/input/serio/at32psif.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c index 95280f9207e1..421a7442e464 100644 --- a/drivers/input/serio/at32psif.c +++ b/drivers/input/serio/at32psif.c @@ -358,19 +358,7 @@ static struct platform_driver psif_driver = { .suspend = psif_suspend, .resume = psif_resume, }; - -static int __init psif_init(void) -{ - return platform_driver_probe(&psif_driver, psif_probe); -} - -static void __exit psif_exit(void) -{ - platform_driver_unregister(&psif_driver); -} - -module_init(psif_init); -module_exit(psif_exit); +module_platform_driver(psif_driver); MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver"); |