diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 11:15:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 11:15:32 -0800 |
commit | 499a2673713c85734a54c37dd90b4b729de399c4 (patch) | |
tree | 426f8e4c7c792dad998beeefb094c439a81b776b /drivers/input/input.c | |
parent | a7016235a61d520e6806f38129001d935c4b6661 (diff) | |
parent | f6bdc2303da6786cc22a7d24b6790e9f75b4cfdc (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: update multi-touch protocol documentation
Input: add the ABS_MT_PRESSURE event
Input: winbond-cir - remove dmesg spam
Input: lifebook - add another Lifebook DMI signature
Input: ad7879 - support auxiliary GPIOs via gpiolib
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r-- | drivers/input/input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 30b503b8d67..86cb2d2196f 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -46,6 +46,7 @@ static unsigned int input_abs_bypass_init_data[] __initdata = { ABS_MT_TOOL_TYPE, ABS_MT_BLOB_ID, ABS_MT_TRACKING_ID, + ABS_MT_PRESSURE, 0 }; static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)]; |