diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 09:59:04 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 09:59:04 +0200 |
| commit | b3aec7b686329e6bb65aa08c7f9458f7fd512f06 (patch) | |
| tree | 67ae55567b5747f32ddd76dd63621bd2ca756a88 /drivers/hid/usbhid | |
| parent | f6f12427844516bc8e9cf84f43aca7bbbaa48157 (diff) | |
| parent | 1bcc20675a1ac1ba47eaa201e02a89b0508e17b2 (diff) | |
| download | op-kernel-dev-b3aec7b686329e6bb65aa08c7f9458f7fd512f06.zip op-kernel-dev-b3aec7b686329e6bb65aa08c7f9458f7fd512f06.tar.gz | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 3146fdc..4ea4641 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -80,10 +80,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH, HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS }, { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_PI_ENGINEERING, USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL, HID_QUIRK_HIDINPUT_FORCE }, |
