Merge branch 'for-4.19/elan' into for-linus

Resolution/pressure fixes and new device support for hid-elan

Merge branch 'for-4.19/elan' into for-linus
Resolution/pressure fixes and new device support for hid-elan
5a12d86c · Jiri Kosina · 415d2b33 · e7ad3dc9 · 5a12d86c · 5a12d86c
Commit 5a12d86c authored Aug 20, 2018 by Jiri Kosina
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 184 additions and 53 deletions

drivers/hid/hid-elan.c drivers/hid/hid-elan.c +182 -53

drivers/hid/hid-ids.h drivers/hid/hid-ids.h +2 -0

No files found.
--- a/drivers/hid/hid-elan.c
+++ b/drivers/hid/hid-elan.c
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -369,6 +369,8 @@
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001

 #define USB_VENDOR_ID_ELAN		0x04f3
+#define USB_DEVICE_ID_TOSHIBA_CLICK_L9W	0x0401
+#define USB_DEVICE_ID_HP_X2		0x074d
 #define USB_DEVICE_ID_HP_X2_10_COVER	0x0755

 #define USB_VENDOR_ID_ELECOM		0x056e