summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-03 14:58:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-03 14:58:48 -0700
commit1cced5015b171415169d938fb179c44fe060dc15 (patch)
tree6bbcc2f3de150af5ecc630fc5d92d5a8ef47d59c /include
parent57a9d89dc093d86920748fa706fd55f4fcd2399a (diff)
parent33096777519a66e632fed7f1e54e6480b4228827 (diff)
downloadlinux-1cced5015b171415169d938fb179c44fe060dc15.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov: "A fix for ALPS driver for issue introduced in the latest update and a tweak for yet another Lenovo box in Synaptics. There will be more ALPS tweaks coming.." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: define INPUT_PROP_ACCELEROMETER behavior Input: synaptics - fix min-max quirk value for E440 Input: synaptics - add quirk for Thinkpad E440 Input: ALPS - fix max coordinates for v5 and v7 protocols Input: add MT_TOOL_PALM
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/input.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index b0a813079852..2f62ab2d7bf9 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -973,7 +973,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