diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 04:27:40 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 04:27:40 -0400 |
| commit | 43e7b1494161bd56dc2bd9bf7c995abc3894089a (patch) | |
| tree | 9663ed073a6c9ea6d78cb433b4679333d4d7b1ea | |
| parent | a083a531e07b83d6fe5feec50423220d328ee8e6 (diff) | |
| parent | 66be621f4b92f209df248cee953bfd2bf37eef81 (diff) | |
Merge branch 'for-4.18/upstream' into for-linus
| -rw-r--r-- | drivers/hid/hid-quirks.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 587e2681a53f..249d49b6b16c 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c | |||
| @@ -416,7 +416,6 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 416 | { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000) }, | 416 | { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000) }, |
| 417 | #endif | 417 | #endif |
| 418 | #if IS_ENABLED(CONFIG_HID_LED) | 418 | #if IS_ENABLED(CONFIG_HID_LED) |
| 419 | { HID_USB_DEVICE(USB_VENDOR_ID_DELCOM, USB_DEVICE_ID_DELCOM_VISUAL_IND) }, | ||
| 420 | { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) }, | 419 | { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) }, |
| 421 | { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) }, | 420 | { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) }, |
| 422 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_LUXAFOR) }, | 421 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_LUXAFOR) }, |