diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2011-11-29 07:13:10 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-30 09:32:18 -0500 |
| commit | 5e7ea11f603a0aeb77fd1bff0b242931ffe139de (patch) | |
| tree | 212542059adf62ba0a9ebe2570de63021642cf64 /drivers/hid/hid-ids.h | |
| parent | 1b723e8dc81b23141bfb8991e002073b17fd0199 (diff) | |
HID: multitouch: merge quanta driver into hid-multitouch
This patch merge the last old-style hid multitouch driver to
the generic one.
It also adds 2 more quanta pids.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3f5e7d6796b3..afa1d87c9ab2 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -584,7 +584,9 @@ | |||
| 584 | #define USB_DEVICE_ID_PRODIGE_CORDLESS 0x3062 | 584 | #define USB_DEVICE_ID_PRODIGE_CORDLESS 0x3062 |
| 585 | 585 | ||
| 586 | #define USB_VENDOR_ID_QUANTA 0x0408 | 586 | #define USB_VENDOR_ID_QUANTA 0x0408 |
| 587 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000 | 587 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000 |
| 588 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001 | ||
| 589 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008 | ||
| 588 | #define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001 | 590 | #define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001 |
| 589 | 591 | ||
| 590 | #define USB_VENDOR_ID_ROCCAT 0x1e7d | 592 | #define USB_VENDOR_ID_ROCCAT 0x1e7d |