diff options
| author | Benjamin Tissoires <benjamin.tissoires@enac.fr> | 2011-11-23 04:54:31 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-23 08:50:38 -0500 |
| commit | e36f690b37945e0a9bb1554e1546eeec93f7d1f6 (patch) | |
| tree | 2f55dc8a58b6f2986a55fae8e3c3bee608d45113 /drivers/hid/hid-multitouch.c | |
| parent | 26a2abe1e1076bf32658fe540eb4cf1c33f481bb (diff) | |
HID: multitouch: cleanup with eGalax PID definitions
This is just a renaming of USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH{N}
to USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_{PID} to handle more eGalax
devices.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index b3b632e797fe..f318c5caad20 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
| @@ -682,26 +682,26 @@ static const struct hid_device_id mt_devices[] = { | |||
| 682 | USB_DEVICE_ID_CYPRESS_TRUETOUCH) }, | 682 | USB_DEVICE_ID_CYPRESS_TRUETOUCH) }, |
| 683 | 683 | ||
| 684 | /* eGalax devices (resistive) */ | 684 | /* eGalax devices (resistive) */ |
| 685 | { .driver_data = MT_CLS_EGALAX, | 685 | { .driver_data = MT_CLS_EGALAX, |
| 686 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | 686 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| 687 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) }, | 687 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) }, |
| 688 | { .driver_data = MT_CLS_EGALAX, | 688 | { .driver_data = MT_CLS_EGALAX, |
| 689 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | 689 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| 690 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, | 690 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) }, |
| 691 | 691 | ||
| 692 | /* eGalax devices (capacitive) */ | 692 | /* eGalax devices (capacitive) */ |
| 693 | { .driver_data = MT_CLS_EGALAX, | 693 | { .driver_data = MT_CLS_EGALAX, |
| 694 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | 694 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| 695 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) }, | 695 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) }, |
| 696 | { .driver_data = MT_CLS_EGALAX, | 696 | { .driver_data = MT_CLS_EGALAX, |
| 697 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | 697 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| 698 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, | 698 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) }, |
| 699 | { .driver_data = MT_CLS_EGALAX, | 699 | { .driver_data = MT_CLS_EGALAX, |
| 700 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | 700 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| 701 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, | 701 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) }, |
| 702 | { .driver_data = MT_CLS_EGALAX, | 702 | { .driver_data = MT_CLS_EGALAX, |
| 703 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | 703 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, |
| 704 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) }, | 704 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, |
| 705 | 705 | ||
| 706 | /* Elo TouchSystems IntelliTouch Plus panel */ | 706 | /* Elo TouchSystems IntelliTouch Plus panel */ |
| 707 | { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, | 707 | { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, |