summaryrefslogtreecommitdiff
path: root/drivers/input/serio/rpckbd.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-01-09 11:38:23 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-01-09 11:38:23 +0400
commitda733563be5a9da26fe81d9f007262d00b846e22 (patch)
treedb28291df94a2043af2123911984c5c173da4e6f /drivers/input/serio/rpckbd.c
parent6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff)
parentdab78d7924598ea4031663dd10db814e2e324928 (diff)
downloadlinux-da733563be5a9da26fe81d9f007262d00b846e22.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/serio/rpckbd.c')
-rw-r--r--drivers/input/serio/rpckbd.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 7ec3c97dc1b9..8b44ddc8041c 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -143,16 +143,4 @@ static struct platform_driver rpckbd_driver = {
.owner = THIS_MODULE,
},
};
-
-static int __init rpckbd_init(void)
-{
- return platform_driver_register(&rpckbd_driver);
-}
-
-static void __exit rpckbd_exit(void)
-{
- platform_driver_unregister(&rpckbd_driver);
-}
-
-module_init(rpckbd_init);
-module_exit(rpckbd_exit);
+module_platform_driver(rpckbd_driver);