diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 17:10:39 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 17:10:39 -0500 |
| commit | e1a0bdd8022317e98650e70850de73eccfcde5ad (patch) | |
| tree | 462f63307118b95c8cbacee6954e4d09ee85b8d1 /include/linux/input.h | |
| parent | 8127f4e883666c9960cfa89cffd36313748f8bab (diff) | |
| parent | 1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
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 97f98ca9b040..6e04c9e811f3 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -702,6 +702,7 @@ struct input_absinfo { | |||
| 702 | #define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ | 702 | #define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ |
| 703 | #define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ | 703 | #define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ |
| 704 | #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ | 704 | #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ |
| 705 | #define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ | ||
| 705 | 706 | ||
| 706 | #define ABS_MAX 0x3f | 707 | #define ABS_MAX 0x3f |
| 707 | #define ABS_CNT (ABS_MAX+1) | 708 | #define ABS_CNT (ABS_MAX+1) |