diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/input/keyboard/nomadik-ske-keypad.c | |
parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/keyboard/nomadik-ske-keypad.c')
-rw-r--r-- | drivers/input/keyboard/nomadik-ske-keypad.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c index 6e0f23091360..5a71e55c9c54 100644 --- a/drivers/input/keyboard/nomadik-ske-keypad.c +++ b/drivers/input/keyboard/nomadik-ske-keypad.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
21 | #include <linux/module.h> | ||
21 | 22 | ||
22 | #include <plat/ske.h> | 23 | #include <plat/ske.h> |
23 | 24 | ||
@@ -378,7 +379,7 @@ static const struct dev_pm_ops ske_keypad_dev_pm_ops = { | |||
378 | }; | 379 | }; |
379 | #endif | 380 | #endif |
380 | 381 | ||
381 | struct platform_driver ske_keypad_driver = { | 382 | static struct platform_driver ske_keypad_driver = { |
382 | .driver = { | 383 | .driver = { |
383 | .name = "nmk-ske-keypad", | 384 | .name = "nmk-ske-keypad", |
384 | .owner = THIS_MODULE, | 385 | .owner = THIS_MODULE, |
@@ -389,18 +390,7 @@ struct platform_driver ske_keypad_driver = { | |||
389 | .probe = ske_keypad_probe, | 390 | .probe = ske_keypad_probe, |
390 | .remove = __devexit_p(ske_keypad_remove), | 391 | .remove = __devexit_p(ske_keypad_remove), |
391 | }; | 392 | }; |
392 | 393 | module_platform_driver(ske_keypad_driver); | |
393 | static int __init ske_keypad_init(void) | ||
394 | { | ||
395 | return platform_driver_probe(&ske_keypad_driver, ske_keypad_probe); | ||
396 | } | ||
397 | module_init(ske_keypad_init); | ||
398 | |||
399 | static void __exit ske_keypad_exit(void) | ||
400 | { | ||
401 | platform_driver_unregister(&ske_keypad_driver); | ||
402 | } | ||
403 | module_exit(ske_keypad_exit); | ||
404 | 394 | ||
405 | MODULE_LICENSE("GPL v2"); | 395 | MODULE_LICENSE("GPL v2"); |
406 | MODULE_AUTHOR("Naveen Kumar <naveen.gaddipati@stericsson.com> / Sundar Iyer <sundar.iyer@stericsson.com>"); | 396 | MODULE_AUTHOR("Naveen Kumar <naveen.gaddipati@stericsson.com> / Sundar Iyer <sundar.iyer@stericsson.com>"); |