History

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

Jiri Kosina committed 8 years ago

Commit 01125b22 parents 4b54530 5b01b3b4 files · +39 −15Browse files

Showing the changes to include/uapi/linux (1 of 4 files). Show all

Unified · Split

include/uapi/linux/input-event-codes.h+1−0
@@ -406,6 +406,7 @@ · 405 unmodified lines
406406 #define BTN_TOOL_MOUSE 0x146
407407 #define BTN_TOOL_LENS 0x147
408408 #define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */
409+#define BTN_STYLUS3 0x149
409410 #define BTN_TOUCH 0x14a
410411 #define BTN_STYLUS 0x14b
411412 #define BTN_STYLUS2 0x14c