diff options
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 8b638792cb43..77afffc6bab8 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -2328,6 +2328,7 @@ static const struct hid_device_id hid_ignore_list[] = { | |||
2328 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, | 2328 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, |
2329 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, | 2329 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, |
2330 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) }, | 2330 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) }, |
2331 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICK16F1454) }, | ||
2331 | { HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) }, | 2332 | { HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) }, |
2332 | { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) }, | 2333 | { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) }, |
2333 | { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) }, | 2334 | { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 9243359c1821..8df47449126c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -638,6 +638,7 @@ | |||
638 | #define USB_DEVICE_ID_PICKIT2 0x0033 | 638 | #define USB_DEVICE_ID_PICKIT2 0x0033 |
639 | #define USB_DEVICE_ID_PICOLCD 0xc002 | 639 | #define USB_DEVICE_ID_PICOLCD 0xc002 |
640 | #define USB_DEVICE_ID_PICOLCD_BOOTLOADER 0xf002 | 640 | #define USB_DEVICE_ID_PICOLCD_BOOTLOADER 0xf002 |
641 | #define USB_DEVICE_ID_PICK16F1454 0x0042 | ||
641 | 642 | ||
642 | #define USB_VENDOR_ID_MICROSOFT 0x045e | 643 | #define USB_VENDOR_ID_MICROSOFT 0x045e |
643 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b | 644 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b |