diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:23:13 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:23:13 +0200 |
| commit | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (patch) | |
| tree | d84a437e8ed4c3e71521c739952ba96fd02b3781 /drivers/hid/hid-ids.h | |
| parent | 0be017120b80f0fe3da9a8239f989a27e54828f2 (diff) | |
| parent | c9b57724b38d4c1555ee49418be3d76801e3327c (diff) | |
| download | linux-3e097d1271ecdff2f251a54ddfc5eaa1f9821e96.tar.gz | |
Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index b04b0820d816..0de3284a3e24 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -922,7 +922,8 @@ #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 |