summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-11-15 11:14:23 +0100
committerJiri Kosina <jkosina@suse.cz>2017-11-15 11:14:23 +0100
commit01125b2d1fe9d691333cc90b17a4e2fd5bb908a2 (patch)
tree7fab7e06d41302e621d7ad00493b15baf81b8ea4 /include
parent4b545304947147bd4b9890160d328780c97bac33 (diff)
parent5b01b3b8b122fde7fbe116803f7863667b4c5beb (diff)
downloadlinux-01125b2d1fe9d691333cc90b17a4e2fd5bb908a2.tar.bz2
Merge branch 'for-4.15/wacom' into for-linus
- High resolution mode for DEll canvas support, from Benjamin Tissoires - A lot of improvements to pen handling in the Wacom driver, from Jason Gerecke Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/input-event-codes.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 179891074b3c..9b3a522f50d1 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -406,6 +406,7 @@
#define BTN_TOOL_MOUSE 0x146
#define BTN_TOOL_LENS 0x147
#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */
+#define BTN_STYLUS3 0x149
#define BTN_TOUCH 0x14a
#define BTN_STYLUS 0x14b
#define BTN_STYLUS2 0x14c