diff options
| author | Stephane Chatty <chatty@lii-enac.fr> | 2009-12-22 17:04:17 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-22 19:28:37 -0500 |
| commit | b6353f4f36f03a12edaf3fa5365b475a28106035 (patch) | |
| tree | ddc9805f66cc095edb1b4614c774b5af13bb457c /drivers/hid/hid-core.c | |
| parent | 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff) | |
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.c | 1 |
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); | |||
| 1248 | 1248 | ||
| 1249 | /* a list of devices for which there is a specialized driver on HID bus */ | 1249 | /* a list of devices for which there is a specialized driver on HID bus */ |
| 1250 | static const struct hid_device_id hid_blacklist[] = { | 1250 | static const struct hid_device_id hid_blacklist[] = { |
| 1251 | { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) }, | ||
| 1251 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, | 1252 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, |
| 1252 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, | 1253 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, |
| 1253 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) }, | 1254 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) }, |