summaryrefslogtreecommitdiff
path: root/drivers/input/misc/cobalt_btns.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 08:11:43 +0400
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 08:11:43 +0400
commitb1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch)
tree17d15f3a6dc5bdd6205070dbef0e339421b13d25 /drivers/input/misc/cobalt_btns.c
parent9d14070f656addddce3d63fd483de46930b51850 (diff)
parentc1537b4863da620f12f5b42ece61bf65314148ed (diff)
downloadlinux-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.xz
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'drivers/input/misc/cobalt_btns.c')
-rw-r--r--drivers/input/misc/cobalt_btns.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index fd8407a29631..53e43d295148 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -163,16 +163,4 @@ static struct platform_driver cobalt_buttons_driver = {
.owner = THIS_MODULE,
},
};
-
-static int __init cobalt_buttons_init(void)
-{
- return platform_driver_register(&cobalt_buttons_driver);
-}
-
-static void __exit cobalt_buttons_exit(void)
-{
- platform_driver_unregister(&cobalt_buttons_driver);
-}
-
-module_init(cobalt_buttons_init);
-module_exit(cobalt_buttons_exit);
+module_platform_driver(cobalt_buttons_driver);