aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorIlya Frolov <zeylie@gmail.com>2007-10-11 08:21:23 -0400
committerJiri Kosina <jkosina@suse.cz>2007-10-14 07:40:02 -0400
commit446943593e6e2cb7133cb6c969afd4626c96a916 (patch)
tree8c5d77fb0e848ec59ae65bee40150a89ee416c57 /drivers/hid
parent3cc5f916050be1d1910c5dd5732110b0a8f27ac8 (diff)
HID: Add GeneralTouch touchscreen to the blacklist
GeneralTouch touchscreens are handled by usbtouchscreen driver, make sure HID ignores them. Signed-off-by: Ilya Frolov <zeylie@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/usbhid/hid-quirks.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index a0d6f081ee5c..41a59a80e7ed 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -117,6 +117,8 @@
117#define USB_VENDOR_ID_GAMERON 0x0810 117#define USB_VENDOR_ID_GAMERON 0x0810
118#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001 118#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001
119 119
120#define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc
121
120#define USB_VENDOR_ID_GLAB 0x06c2 122#define USB_VENDOR_ID_GLAB 0x06c2
121#define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038 123#define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
122#define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039 124#define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
@@ -401,6 +403,10 @@ static const struct hid_blacklist {
401 { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE }, 403 { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },
402 { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE }, 404 { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE },
403 { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, 405 { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE },
406 { USB_VENDOR_ID_GENERAL_TOUCH, 0x0001, HID_QUIRK_IGNORE },
407 { USB_VENDOR_ID_GENERAL_TOUCH, 0x0002, HID_QUIRK_IGNORE },
408 { USB_VENDOR_ID_GENERAL_TOUCH, 0x0003, HID_QUIRK_IGNORE },
409 { USB_VENDOR_ID_GENERAL_TOUCH, 0x0004, HID_QUIRK_IGNORE },
404 { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE }, 410 { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
405 { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE }, 411 { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
406 { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT, HID_QUIRK_IGNORE }, 412 { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT, HID_QUIRK_IGNORE },