diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 12:27:16 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 12:27:16 +0200 |
| commit | f454d9a378a1ccb676adfa6e2449ef17e66696b5 (patch) | |
| tree | a0a1d82701a70f136ffd3199990dc5f468baa949 /drivers | |
| parent | c9f289701540baeef9ac7c9977d67a7259f404db (diff) | |
| parent | 3045696d0ce663d67c95dcb8206d3de57f6841ec (diff) | |
Merge branch 'for-5.7/core' into for-linus
- device-specific (ITE 8595) fix from Hans de Goede
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-quirks.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 3735546bb524..ebec818344af 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -398,9 +398,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2) }, #endif -#if IS_ENABLED(CONFIG_HID_ITE) - { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) }, -#endif #if IS_ENABLED(CONFIG_HID_ICADE) { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) }, #endif |