diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:10:38 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:10:38 +0300 |
| commit | 6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 (patch) | |
| tree | 718281e0f03caaf45c3928fab322e60f7631a9bb /drivers/hid/hid-ids.h | |
| parent | b50b9d3d21e0af1b8bda94d43c569593d45587af (diff) | |
| parent | 7da85fbf1c87d4f73621e0e7666a3387497075a9 (diff) | |
| download | linux-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.tar.xz | |
Merge branch 'for-4.15/upstream' into for-linus
- cp2112: GPIO error handling and Kconfig fixes from Sébastien Szymanski
- i2c-hid: fixup / quirk for Apollo-Lake based laptops, from Hans de Goede
- Input/Core: add eraser tool support, from Ping Cheng
- small assorted code fixes
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index c9f7c74b3b60..5da3d6256d25 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -513,6 +513,9 @@ #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 #define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008 +#define I2C_VENDOR_ID_HANTICK 0x0911 +#define I2C_PRODUCT_ID_HANTICK_5288 0x5288 + #define USB_VENDOR_ID_HANWANG 0x0b57 #define USB_DEVICE_ID_HANWANG_TABLET_FIRST 0x5000 #define USB_DEVICE_ID_HANWANG_TABLET_LAST 0x8fff |