diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 16:20:18 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 16:20:18 -0500 |
| commit | 56012808f4d5606e401539f663d92009d964425b (patch) | |
| tree | f3736a97725647393a2db7c95462d857115197ca /include/linux/input.h | |
| parent | a814290e17ae314bd614476cffc6119846eca27e (diff) | |
| parent | b2a731aa5cbca7e0252da75e16de7ae5feb1313a (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'include/linux/input.h')
| -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 7be8a6537b57..735ceaf1bc2d 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -660,6 +660,7 @@ struct input_absinfo { | |||
| 660 | #define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ | 660 | #define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ |
| 661 | #define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ | 661 | #define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ |
| 662 | #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ | 662 | #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ |
| 663 | #define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ | ||
| 663 | 664 | ||
| 664 | #define ABS_MAX 0x3f | 665 | #define ABS_MAX 0x3f |
| 665 | #define ABS_CNT (ABS_MAX+1) | 666 | #define ABS_CNT (ABS_MAX+1) |