diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 05:14:23 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 05:14:23 -0500 |
| commit | 01125b2d1fe9d691333cc90b17a4e2fd5bb908a2 (patch) | |
| tree | 7fab7e06d41302e621d7ad00493b15baf81b8ea4 /include/uapi/linux/input-event-codes.h | |
| parent | 4b545304947147bd4b9890160d328780c97bac33 (diff) | |
| parent | 5b01b3b8b122fde7fbe116803f7863667b4c5beb (diff) | |
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/uapi/linux/input-event-codes.h')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 1 |
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 @@ | |||
| 406 | #define BTN_TOOL_MOUSE 0x146 | 406 | #define BTN_TOOL_MOUSE 0x146 |
| 407 | #define BTN_TOOL_LENS 0x147 | 407 | #define BTN_TOOL_LENS 0x147 |
| 408 | #define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ | 408 | #define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ |
| 409 | #define BTN_STYLUS3 0x149 | ||
| 409 | #define BTN_TOUCH 0x14a | 410 | #define BTN_TOUCH 0x14a |
| 410 | #define BTN_STYLUS 0x14b | 411 | #define BTN_STYLUS 0x14b |
| 411 | #define BTN_STYLUS2 0x14c | 412 | #define BTN_STYLUS2 0x14c |