diff options
author | Stephane Chatty <chatty@lii-enac.fr> | 2010-04-22 17:24:36 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 18:19:08 -0400 |
commit | ba4d8abb31def963f49b7c239a8acce57fe1d1cc (patch) | |
tree | 1b13872daef9144c0d1e6aaba3c5944a16b1a206 /drivers/hid | |
parent | 653efbb4b2c796a39c67501e4bce983a41278dfa (diff) |
HID: Support for the 11.6" Cando panel
Added support for the 11.6" Cando panel found on the Acer Timeline 1825PTZ.
Signed-off-by: Stephane Chatty <chatty@enac.fr>
Tested-by: Johannes Klug <johannesklug@room2web.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-cando.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-cando.c b/drivers/hid/hid-cando.c index f9b2233d9e47..4267a6fdc277 100644 --- a/drivers/hid/hid-cando.c +++ b/drivers/hid/hid-cando.c | |||
@@ -235,6 +235,8 @@ static void cando_remove(struct hid_device *hdev) | |||
235 | static const struct hid_device_id cando_devices[] = { | 235 | static const struct hid_device_id cando_devices[] = { |
236 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, | 236 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, |
237 | USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, | 237 | USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, |
238 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, | ||
239 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, | ||
238 | { } | 240 | { } |
239 | }; | 241 | }; |
240 | MODULE_DEVICE_TABLE(hid, cando_devices); | 242 | MODULE_DEVICE_TABLE(hid, cando_devices); |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index fefbe3fdf8e6..262ab1048b60 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1296,6 +1296,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1296 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, | 1296 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, |
1297 | { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, | 1297 | { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, |
1298 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, | 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, |
1299 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, | ||
1299 | { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, | 1300 | { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, |
1300 | { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, | 1301 | { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, |
1301 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, | 1302 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 635970462eaa..968f59bb2e95 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -125,6 +125,7 @@ | |||
125 | 125 | ||
126 | #define USB_VENDOR_ID_CANDO 0x2087 | 126 | #define USB_VENDOR_ID_CANDO 0x2087 |
127 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01 | 127 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01 |
128 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03 | ||
128 | 129 | ||
129 | #define USB_VENDOR_ID_CH 0x068e | 130 | #define USB_VENDOR_ID_CH 0x068e |
130 | #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 | 131 | #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 |