git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.15/wacom' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
hid
/
wacom_wac.h
diff --git
a/drivers/hid/wacom_wac.h
b/drivers/hid/wacom_wac.h
index feb62fd4dfc3ecff1ba43ee46fc7f70ec9b3c6d2..64d8f014602ea0dae29830bd4259e6a1dba42f7e 100644
(file)
--- 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;