summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2015-04-22 08:24:27 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2015-04-22 08:24:38 +1000
commita0cdb7f6227c2894836cc674aa04884b0a09e7dc (patch)
tree4dbea3bb98a23f068d6924ddcfc4c164bacd4852 /include
parent9df84962fd6eda60447bf37fe0fef9ed8e9b3f19 (diff)
Update to v4.0 kernel header
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/input.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index e5acbe5b..4bf3d6d4 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -162,6 +162,7 @@ struct input_keymap_entry {
#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */
#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
+#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */
#define INPUT_PROP_MAX 0x1f
#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
@@ -967,7 +968,8 @@ struct input_keymap_entry {
*/
#define MT_TOOL_FINGER 0
#define MT_TOOL_PEN 1
-#define MT_TOOL_MAX 1
+#define MT_TOOL_PALM 2
+#define MT_TOOL_MAX 2
/*
* Values describing the status of a force-feedback effect