summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-core.c
diff options
context:
space:
mode:
authorStephane Chatty <chatty@lii-enac.fr>2009-12-23 01:04:17 +0300
committerJiri Kosina <jkosina@suse.cz>2009-12-23 03:28:37 +0300
commitb6353f4f36f03a12edaf3fa5365b475a28106035 (patch)
treeddc9805f66cc095edb1b4614c774b5af13bb457c /drivers/hid/hid-core.c
parent3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff)
downloadlinux-b6353f4f36f03a12edaf3fa5365b475a28106035.tar.xz
HID: Support for 3M multitouch panel
Add support for 3M multitouch panels. Signed-off-by: Stephane Chatty <chatty@enac.fr> [jkosina@suse.cz: fix build failure because of inconsistent 3M/MMM defines] Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-core.c')
-rw-r--r--drivers/hid/hid-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 80792d38d25c..70c25a056205 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1248,6 +1248,7 @@ EXPORT_SYMBOL_GPL(hid_disconnect);
/* a list of devices for which there is a specialized driver on HID bus */
static const struct hid_device_id hid_blacklist[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) },
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },