summaryrefslogtreecommitdiffstats
path: root/include/linux/input.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-02 23:10:39 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-02 23:10:39 +0100
commite1a0bdd8022317e98650e70850de73eccfcde5ad (patch)
tree462f63307118b95c8cbacee6954e4d09ee85b8d1 /include/linux/input.h
parent8127f4e883666c9960cfa89cffd36313748f8bab (diff)
parent1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff)
downloadop-kernel-dev-e1a0bdd8022317e98650e70850de73eccfcde5ad.zip
op-kernel-dev-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.gz
Merge branch 'master' into upstream
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'include/linux/input.h')
-rw-r--r--include/linux/input.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index 97f98ca..6e04c9e 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -702,6 +702,7 @@ struct input_absinfo {
#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */
#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */
#define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */
+#define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */
#define ABS_MAX 0x3f
#define ABS_CNT (ABS_MAX+1)
OpenPOWER on IntegriCloud