projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.3/gembird' into for-linus
[linux-drm-fsl-dcu.git]
/
drivers
/
hid
/
hid-ids.h
diff --git
a/drivers/hid/hid-ids.h
b/drivers/hid/hid-ids.h
index b4d7a084367562eedf9d649374d09cb9f8c6493e..624d916d39d240c1a4bcce195015202b76f3621c 100644
(file)
--- a/
drivers/hid/hid-ids.h
+++ b/
drivers/hid/hid-ids.h
@@
-928,7
+928,8
@@
#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688
#define USB_VENDOR_ID_TPV 0x25aa
#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688
#define USB_VENDOR_ID_TPV 0x25aa
-#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN 0x8883
+#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882 0x8882
+#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8883 0x8883
#define USB_VENDOR_ID_TURBOX 0x062a
#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201
#define USB_VENDOR_ID_TURBOX 0x062a
#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201