diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2013-05-17 14:34:49 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-20 14:48:23 +0200 |
| commit | adb91aef9f9965341a9252bd610b5d828d5c016f (patch) | |
| tree | 7fbc73a4ded864646fb421ebfc4fe903b3378116 /drivers/hid | |
| parent | aa672da1b05680f7f087873ae2d02f4a9bf4a829 (diff) | |
| download | op-kernel-dev-adb91aef9f9965341a9252bd610b5d828d5c016f.zip op-kernel-dev-adb91aef9f9965341a9252bd610b5d828d5c016f.tar.gz | |
HID: remove duplicate ID for D-WAV eGalax 0x7224
This patch also removes the duplicate entry in the hid-multitouch.c as
suggested by Benjamin Tissoires.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 5b7e148..8add4ae 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -271,7 +271,6 @@ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A 0x722A #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E 0x725e #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262 0x7262 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 590aa37..d99b959 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1131,9 +1131,6 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_EGALAX_SERIAL, MT_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, - { .driver_data = MT_CLS_EGALAX, - HID_USB_DEVICE(USB_VENDOR_ID_DWAV, - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, { .driver_data = MT_CLS_EGALAX_SERIAL, MT_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) }, |
