diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 11:48:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 11:48:25 -0400 |
commit | 5f789cd8bae9b6315b7bf93e24ec1ac85f5a13b9 (patch) | |
tree | 42a0c72316275101803aa972e7292f74c6d07a4f /drivers/input/input.c | |
parent | 3da9e9d34ed7d2f5c33fd194d9dd09e15f4e51c0 (diff) | |
parent | a3ce6ea46cc0d6397d1b92b1a5983bb2935306ed (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: libps2 - better handle bad scheduler decisions
Input: usb1400_ts - fix access to "device data" in resume function
Input: multitouch - augment event semantics documentation
Input: multitouch - add tracking ID to the protocol
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 e54e002665b0..5d445f48789b 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
@@ -42,6 +42,7 @@ static unsigned int input_abs_bypass_init_data[] __initdata = { | |||
42 | ABS_MT_POSITION_Y, | 42 | ABS_MT_POSITION_Y, |
43 | ABS_MT_TOOL_TYPE, | 43 | ABS_MT_TOOL_TYPE, |
44 | ABS_MT_BLOB_ID, | 44 | ABS_MT_BLOB_ID, |
45 | ABS_MT_TRACKING_ID, | ||
45 | 0 | 46 | 0 |
46 | }; | 47 | }; |
47 | static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)]; | 48 | static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)]; |