aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorDavid Gow <david@ingeniumdigital.com>2010-08-19 03:43:56 -0400
committerJiri Kosina <jkosina@suse.cz>2010-08-19 04:59:14 -0400
commit7cacfa87d3018c68bef2defeda8948f753dfa9d0 (patch)
tree040a52036a64addb84e5e4363a5c12d51c81946d /drivers/hid
parent763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff)
HID: Add support for chicony multitouch screens.
Adds a hid quirk for the chicony multitouch screen found in the Acer Aspire 1820pt notebook. Signed-off-by: David Gow <david@ingeniumdigital.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-ids.h1
-rw-r--r--drivers/hid/usbhid/hid-quirks.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 85c6d13c9ffa..29051425ca0f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -149,6 +149,7 @@
149 149
150#define USB_VENDOR_ID_CHICONY 0x04f2 150#define USB_VENDOR_ID_CHICONY 0x04f2
151#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD 0x0418 151#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD 0x0418
152#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d
152 153
153#define USB_VENDOR_ID_CIDC 0x1677 154#define USB_VENDOR_ID_CIDC 0x1677
154 155
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 2643d3147621..1b222398ff54 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -77,6 +77,8 @@ static const struct hid_blacklist {
77 77
78 { USB_VENDOR_ID_PI_ENGINEERING, USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL, HID_QUIRK_HIDINPUT_FORCE }, 78 { USB_VENDOR_ID_PI_ENGINEERING, USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL, HID_QUIRK_HIDINPUT_FORCE },
79 79
80 { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT },
81
80 { 0, 0 } 82 { 0, 0 }
81}; 83};
82 84