diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:02:25 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:02:25 +0300 |
| commit | 83fd5ddc19931d5a5b884c43ee3c9d69c673bc96 (patch) | |
| tree | 5e728cf3d7c080b73eeea46e16faa520169f849d /drivers/hid/wacom_wac.h | |
| parent | a0933a456ff83a3b5ffa3a1903e0b8de4a56adf5 (diff) | |
| parent | 1477edb4853bd730e3ab37fa9165651c03c2cc05 (diff) | |
| download | linux-83fd5ddc19931d5a5b884c43ee3c9d69c673bc96.tar.xz | |
Merge branch 'for-4.14/upstream-fixes' into for-linus
- Wacom: recognize PEN application collection properly, from Jason Gerecke
- RMI: avoid cofusion caused by RMI functions being by mistake called on
non-RMI devices, from Andrew Duggan
- small device-ID-specific quirks/fixes
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.h')
| -rw-r--r-- | drivers/hid/wacom_wac.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 8a03654048bf..feb62fd4dfc3 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -166,6 +166,7 @@ ((f)->physical == HID_DG_PEN) || \ ((f)->application == HID_DG_PEN) || \ ((f)->application == HID_DG_DIGITIZER) || \ + ((f)->application == WACOM_HID_WD_PEN) || \ ((f)->application == WACOM_HID_WD_DIGITIZER) || \ ((f)->application == WACOM_HID_G9_PEN) || \ ((f)->application == WACOM_HID_G11_PEN)) |