diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 16:34:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 16:34:33 -0400 |
commit | 96d6d72d4e6969dba026496917d82b311d74c3ca (patch) | |
tree | 072673d8ad4ed203de4de7fd6155d8c67446d7fc /drivers/input/misc | |
parent | 4309e092421e08f411830b2675bc1538a9b90e9b (diff) | |
parent | c85e2031eb55381a5e2f0f66c2e1d62ecd58eb85 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: evdev - fix printf() format for sizeof
Input: remove version.h from drivers that don't need it
Input: cobalt_btns - add missing MODULE_LICENSE
Diffstat (limited to 'drivers/input/misc')
-rw-r--r-- | drivers/input/misc/cobalt_btns.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c index 6a1f48b76e32..2adf9cb265da 100644 --- a/drivers/input/misc/cobalt_btns.c +++ b/drivers/input/misc/cobalt_btns.c | |||
@@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev) | |||
148 | return 0; | 148 | return 0; |
149 | } | 149 | } |
150 | 150 | ||
151 | MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>"); | ||
152 | MODULE_DESCRIPTION("Cobalt button interface driver"); | ||
153 | MODULE_LICENSE("GPL"); | ||
151 | /* work with hotplug and coldplug */ | 154 | /* work with hotplug and coldplug */ |
152 | MODULE_ALIAS("platform:Cobalt buttons"); | 155 | MODULE_ALIAS("platform:Cobalt buttons"); |
153 | 156 | ||