kernel
Révision | 3154f7168673bf0e001d9253ee57e70cc6c819c0 (tree) |
---|---|
l'heure | 2011-06-27 19:24:49 |
Auteur | Benjamin Tissoires <benjamin.tissoires@gmai...> |
Commiter | Chih-Wei Huang |
hid-multitouch: Add device id for another DWAV/eGalax variant
Add the device id for a DWAV eGalax touchscreen, found
on the Dell Inspiron Duo.
edit hid-ids.h to match upstream kernel.
Signed-off-by: Gabriel M. Beddingfield <gabrbedd@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
@@ -1339,6 +1339,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | ||
1339 | 1339 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, |
1340 | 1340 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, |
1341 | 1341 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) }, |
1342 | + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH6) }, | |
1342 | 1343 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, |
1343 | 1344 | { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) }, |
1344 | 1345 | { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) }, |
@@ -215,7 +215,8 @@ | ||
215 | 215 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 |
216 | 216 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e |
217 | 217 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b |
218 | -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0xa001 | |
218 | +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 0x725e | |
219 | +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH6 0xa001 | |
219 | 220 | |
220 | 221 | #define USB_VENDOR_ID_ELECOM 0x056e |
221 | 222 | #define USB_DEVICE_ID_ELECOM_BM084 0x0061 |
@@ -666,6 +666,9 @@ static const struct hid_device_id mt_devices[] = { | ||
666 | 666 | { .driver_data = MT_CLS_EGALAX, |
667 | 667 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
668 | 668 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) }, |
669 | + { .driver_data = MT_CLS_EGALAX, | |
670 | + HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | |
671 | + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH6) }, | |
669 | 672 | |
670 | 673 | /* Elo TouchSystems IntelliTouch Plus panel */ |
671 | 674 | { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, |