aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/usbhid/hid-core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index cec3bffa0a9a..82fcb91f893a 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -280,7 +280,8 @@ MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
280#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 280#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
281#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 281#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
282#define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201 282#define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201
283#define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 283#define USB_DEVICE_ID_QUAD_USB_JOYPAD 0x8800
284#define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866
284 285
285#define USB_VENDOR_ID_WISEGROUP_LTD 0x6677 286#define USB_VENDOR_ID_WISEGROUP_LTD 0x6677
286#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802 287#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802
@@ -456,6 +457,8 @@ static const struct hid_blacklist {
456 { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, 457 { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
457 { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, 458 { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
458 { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, 459 { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
460 { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
461
459 { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, 462 { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
460 463
461 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, 464 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE },