Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / drivers / input / misc / cobalt_btns.c

diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 5511ef006a66c591cf59df2ffde421001f282758..2adf9cb265da69fd67b6d1b8bec3fa3841e95ec2 100644 (file)
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -148,6 +148,12 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev)
        return 0;
 }
 
+MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
+MODULE_DESCRIPTION("Cobalt button interface driver");
+MODULE_LICENSE("GPL");
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:Cobalt buttons");
+
 static struct platform_driver cobalt_buttons_driver = {
        .probe  = cobalt_buttons_probe,
        .remove = __devexit_p(cobalt_buttons_remove),