aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r--drivers/hid/usbhid/hid-core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 5e430813d4d4..823e3dfca003 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -106,6 +106,9 @@ MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
106#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205 106#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205
107#define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208 107#define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208
108 108
109#define USB_VENDOR_ID_BELKIN 0x050d
110#define USB_DEVICE_ID_FLIP_KVM 0x3201
111
109#define USB_VENDOR_ID_BERKSHIRE 0x0c98 112#define USB_VENDOR_ID_BERKSHIRE 0x0c98
110#define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 113#define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140
111 114
@@ -310,6 +313,8 @@ static const struct hid_blacklist {
310 313
311 { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES }, 314 { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES },
312 315
316 { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
317
313 { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01, HID_QUIRK_IGNORE }, 318 { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01, HID_QUIRK_IGNORE },
314 { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10, HID_QUIRK_IGNORE }, 319 { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10, HID_QUIRK_IGNORE },
315 { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20, HID_QUIRK_IGNORE }, 320 { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20, HID_QUIRK_IGNORE },