Merge commit 'v2.6.27-rc1' into x86/urgent

[linux-2.6] / drivers / input / keyboard / corgikbd.c

diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 5d6cc7f1dc947d74c9de6a955080fb388c087c6d..1aa46ae1263025bacdc9627faae989066d025969 100644 (file)
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -393,6 +393,7 @@ static struct platform_driver corgikbd_driver = {
        .resume         = corgikbd_resume,
        .driver         = {
                .name   = "corgi-keyboard",
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -411,4 +412,5 @@ module_exit(corgikbd_exit);
 
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
 MODULE_DESCRIPTION("Corgi Keyboard Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:corgi-keyboard");