diff options
author | Benjamin Tissoires <benjamin.tissoires@enac.fr> | 2011-01-08 06:15:41 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-01-11 15:26:55 -0500 |
commit | bc5ab083a68bfec212780281f8e57d871d8882a0 (patch) | |
tree | d2426a4f1508f6b12cea5ebdb7a90e7167f38824 /drivers/hid | |
parent | 5572da08a784621f2ab4fdc8dc65471261871795 (diff) |
HID: add Add Cando touch screen 10.1-inch product id
This device has been reported to be an hid-cando one.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
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 5925bdcd417d..343c41bac80e 100644 --- a/drivers/hid/hid-cando.c +++ b/drivers/hid/hid-cando.c | |||
@@ -236,6 +236,8 @@ 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, | 238 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, |
239 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) }, | ||
240 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, | ||
239 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, | 241 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, |
240 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, | 242 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, |
241 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, | 243 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 42cfc9464c0a..76ee7111d16c 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1288,6 +1288,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1288 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, | 1288 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, |
1289 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) }, | 1289 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) }, |
1290 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, | 1290 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, |
1291 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) }, | ||
1291 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, | 1292 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, |
1292 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, | 1293 | { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, |
1293 | { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, | 1294 | { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 265c747ba9b8..372b5cf2a92f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -136,6 +136,7 @@ | |||
136 | #define USB_VENDOR_ID_CANDO 0x2087 | 136 | #define USB_VENDOR_ID_CANDO 0x2087 |
137 | #define USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH 0x0703 | 137 | #define USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH 0x0703 |
138 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01 | 138 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01 |
139 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1 0x0a02 | ||
139 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03 | 140 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03 |
140 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01 | 141 | #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01 |
141 | 142 | ||