diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:14:23 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:14:23 +0100 |
| commit | 01125b2d1fe9d691333cc90b17a4e2fd5bb908a2 (patch) | |
| tree | 7fab7e06d41302e621d7ad00493b15baf81b8ea4 /drivers/hid/wacom_wac.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 'drivers/hid/wacom_wac.h')
| -rw-r--r-- | drivers/hid/wacom_wac.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index feb62fd4dfc3..64d8f014602e 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -292,6 +292,8 @@ struct hid_data { bool inrange_state; bool invert_state; bool tipswitch; + bool barrelswitch; + bool barrelswitch2; int x; int y; int pressure; |