Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 97f98ca9b040d44f6de371ab32e2bb0ddb9eade7..6e04c9e811f394a63cd2480df3947ddbe7c7bbe8 100644 (file)
--- 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)