diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:05:28 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:05:28 +0300 |
| commit | d3c7ad2432115b0b53fb838c14b8ad9ad72f7254 (patch) | |
| tree | 014d9ae6c1bd9aaae54f2d99e362fc4eec576465 /drivers/hid/hid-ids.h | |
| parent | d487bb6ef121357bd4cd42fe2b08a6857ed26525 (diff) | |
| parent | 73c75d395857960ea135913da7bb9537248a11e6 (diff) | |
| download | linux-d3c7ad2432115b0b53fb838c14b8ad9ad72f7254.tar.xz | |
Merge branch 'for-4.14/asus' into for-linus
- T100 touchpad support from Hans de Goede
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index f23f09ea67d1..40d56b42c83b 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -176,6 +176,7 @@ #define USB_DEVICE_ID_ASUSTEK_LCM 0x1726 #define USB_DEVICE_ID_ASUSTEK_LCM2 0x175b #define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD 0x17e0 +#define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD 0x8502 #define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD 0x8585 #define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD 0x0101 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854 |