diff options
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-quanta.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 2dd9b28e39c4..282f4a1e7214 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1343,6 +1343,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1343 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, | 1343 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, |
1344 | { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, | 1344 | { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, |
1345 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, | 1345 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, |
1346 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, | ||
1346 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, | 1347 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, |
1347 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, | 1348 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, |
1348 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, | 1349 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 39ff98a5bd61..b29d9da799f4 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -400,6 +400,7 @@ | |||
400 | 400 | ||
401 | #define USB_VENDOR_ID_QUANTA 0x0408 | 401 | #define USB_VENDOR_ID_QUANTA 0x0408 |
402 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000 | 402 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000 |
403 | #define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001 | ||
403 | 404 | ||
404 | #define USB_VENDOR_ID_SAMSUNG 0x0419 | 405 | #define USB_VENDOR_ID_SAMSUNG 0x0419 |
405 | #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 | 406 | #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 |
diff --git a/drivers/hid/hid-quanta.c b/drivers/hid/hid-quanta.c index 244d61c18a47..9ac49287b943 100644 --- a/drivers/hid/hid-quanta.c +++ b/drivers/hid/hid-quanta.c | |||
@@ -224,6 +224,8 @@ static void quanta_remove(struct hid_device *hdev) | |||
224 | static const struct hid_device_id quanta_devices[] = { | 224 | static const struct hid_device_id quanta_devices[] = { |
225 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, | 225 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, |
226 | USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, | 226 | USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, |
227 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, | ||
228 | USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, | ||
227 | { } | 229 | { } |
228 | }; | 230 | }; |
229 | MODULE_DEVICE_TABLE(hid, quanta_devices); | 231 | MODULE_DEVICE_TABLE(hid, quanta_devices); |