summaryrefslogtreecommitdiffstats
path: root/include/linux/input.h
diff options
context:
space:
mode:
authorDavid S. Miller2010-02-17 07:09:29 +0100
committerDavid S. Miller2010-02-17 07:09:29 +0100
commit2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch)
treec1f0d002e69868606eca9d1b919835f422892063 /include/linux/input.h
parentxfrm: avoid spinlock in get_acqseq() used by xfrm user (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff)
downloadkernel-qcow2-linux-2bb4646fce8d09916b351d1a62f98db7cec6fc41.tar.gz
kernel-qcow2-linux-2bb4646fce8d09916b351d1a62f98db7cec6fc41.tar.xz
kernel-qcow2-linux-2bb4646fce8d09916b351d1a62f98db7cec6fc41.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 7be8a6537b57..735ceaf1bc2d 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -660,6 +660,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)