diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:05:28 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:05:28 +0200 |
| commit | d3c7ad2432115b0b53fb838c14b8ad9ad72f7254 (patch) | |
| tree | 014d9ae6c1bd9aaae54f2d99e362fc4eec576465 /drivers/hid/hid-core.c | |
| parent | d487bb6ef121357bd4cd42fe2b08a6857ed26525 (diff) | |
| parent | 73c75d395857960ea135913da7bb9537248a11e6 (diff) | |
Merge branch 'for-4.14/asus' into for-linus
- T100 touchpad support from Hans de Goede
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 9017dcc14502..d946d561e064 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1982,6 +1982,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) }, { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) }, { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD) }, #endif #if IS_ENABLED(CONFIG_HID_AUREAL) { HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) }, |