diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-16 14:09:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-16 14:09:19 -0700 |
| commit | 279b1e0fd90ef63c7acb34a5ca573f065a6fefb4 (patch) | |
| tree | 25dfe9e76c375c2357096fc4ec334c5b00790ce0 /drivers/input/keyboard | |
| parent | abbe0d3c26c545930492981cbd64be340ff41e05 (diff) | |
| parent | 8f9068609e8a5b4cbac9e0cf8332b5dcabf05422 (diff) | |
| download | linux-279b1e0fd90ef63c7acb34a5ca573f065a6fefb4.tar.gz linux-279b1e0fd90ef63c7acb34a5ca573f065a6fefb4.tar.bz2 linux-279b1e0fd90ef63c7acb34a5ca573f065a6fefb4.zip | |
Merge branch 'for-linus' of git://github.com/dtor/input
* 'for-linus' of git://github.com/dtor/input:
Input: wacom - fix touch parsing on newer Bamboos
Input: bcm5974 - add MacBookAir4,1 trackpad support
Input: wacom - add POINTER and DIRECT device properties
Input: adp5588-keys - remove incorrect modalias
Input: cm109 - fix checking return value of usb_control_msg
Input: wacom - advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner
Input: wacom - remove pressure for touch devices
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/adp5588-keys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 7b404e5443ed..e34eeb8ae371 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c @@ -668,4 +668,3 @@ module_exit(adp5588_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); MODULE_DESCRIPTION("ADP5588/87 Keypad driver"); -MODULE_ALIAS("platform:adp5588-keys"); |