Commit f454d9a3 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.7/core' into for-linus 

- device-specific (ITE 8595) fix from Hans de Goede
parents c9f28970 3045696d

drivers/hid/hid-quirks.c

+0 −3
Original line number Diff line number Diff line
@@ -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