summaryrefslogtreecommitdiff
path: root/drivers/input/keyboard/jornada680_kbd.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-24 23:37:52 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-24 23:37:52 -0400
commit308f0a5898033691d050374a949bbfe173987a16 (patch)
tree9a7f2798e2f778d6ec126c2f9a1e2c0ba007c742 /drivers/input/keyboard/jornada680_kbd.c
parent0035a1dc8f56f2c92f4246b0c8b5f6d1ee10c76b (diff)
parentb345dc7da026016b65162b1ca7cfcd2c7212a285 (diff)
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/input/keyboard/jornada680_kbd.c')
-rw-r--r--drivers/input/keyboard/jornada680_kbd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c
index a23633a2e1b4..9387da343f97 100644
--- a/drivers/input/keyboard/jornada680_kbd.c
+++ b/drivers/input/keyboard/jornada680_kbd.c
@@ -254,6 +254,7 @@ static int __devexit jornada680kbd_remove(struct platform_device *pdev)
static struct platform_driver jornada680kbd_driver = {
.driver = {
.name = "jornada680_kbd",
+ .owner = THIS_MODULE,
},
.probe = jornada680kbd_probe,
.remove = __devexit_p(jornada680kbd_remove),
@@ -275,3 +276,4 @@ module_exit(jornada680kbd_exit);
MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver");
MODULE_LICENSE("GPLv2");
+MODULE_ALIAS("platform:jornada680_kbd");