diff options
author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2011-12-23 09:41:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 20:24:53 -0500 |
commit | 277a05f83af8c82291cf5f2ad0c2dd1aa6f29de7 (patch) | |
tree | dd0819f4465a7e5a817a66cdc246be45c494fc8e | |
parent | 1628de01ac388c9104ddc2816491ff591dfe28a8 (diff) |
HID: multitouch: add support for 3M 32"
commit c4fad877cd0efb51d8180ae2eaa791c99c92051c upstream.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 92d4f07c48f..e0a28ade952 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #define USB_VENDOR_ID_3M 0x0596 | 21 | #define USB_VENDOR_ID_3M 0x0596 |
22 | #define USB_DEVICE_ID_3M1968 0x0500 | 22 | #define USB_DEVICE_ID_3M1968 0x0500 |
23 | #define USB_DEVICE_ID_3M2256 0x0502 | 23 | #define USB_DEVICE_ID_3M2256 0x0502 |
24 | #define USB_DEVICE_ID_3M3266 0x0506 | ||
24 | 25 | ||
25 | #define USB_VENDOR_ID_A4TECH 0x09da | 26 | #define USB_VENDOR_ID_A4TECH 0x09da |
26 | #define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006 | 27 | #define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006 |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index c78350ea25a..1308703afdb 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -593,6 +593,9 @@ static const struct hid_device_id mt_devices[] = { | |||
593 | { .driver_data = MT_CLS_3M, | 593 | { .driver_data = MT_CLS_3M, |
594 | HID_USB_DEVICE(USB_VENDOR_ID_3M, | 594 | HID_USB_DEVICE(USB_VENDOR_ID_3M, |
595 | USB_DEVICE_ID_3M2256) }, | 595 | USB_DEVICE_ID_3M2256) }, |
596 | { .driver_data = MT_CLS_3M, | ||
597 | HID_USB_DEVICE(USB_VENDOR_ID_3M, | ||
598 | USB_DEVICE_ID_3M3266) }, | ||
596 | 599 | ||
597 | /* ActionStar panels */ | 600 | /* ActionStar panels */ |
598 | { .driver_data = MT_CLS_DEFAULT, | 601 | { .driver_data = MT_CLS_DEFAULT, |