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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 0e6ff5de358..6fed4f6a9c9 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -656,6 +656,7 @@ struct input_absinfo { | |||
| 656 | #define ABS_MT_POSITION_Y 0x36 /* Center Y ellipse position */ | 656 | #define ABS_MT_POSITION_Y 0x36 /* Center Y ellipse position */ |
| 657 | #define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ | 657 | #define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ |
| 658 | #define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ | 658 | #define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ |
| 659 | #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ | ||
| 659 | 660 | ||
| 660 | #define ABS_MAX 0x3f | 661 | #define ABS_MAX 0x3f |
| 661 | #define ABS_CNT (ABS_MAX+1) | 662 | #define ABS_CNT (ABS_MAX+1) |