diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2013-05-17 07:34:49 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-20 08:48:23 -0400 |
commit | adb91aef9f9965341a9252bd610b5d828d5c016f (patch) | |
tree | 7fbc73a4ded864646fb421ebfc4fe903b3378116 /drivers/hid | |
parent | aa672da1b05680f7f087873ae2d02f4a9bf4a829 (diff) |
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 5b7e148ca927..8add4ae0c4ec 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -271,7 +271,6 @@ | |||
271 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207 | 271 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207 |
272 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c | 272 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c |
273 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 | 273 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 |
274 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 | ||
275 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A 0x722A | 274 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A 0x722A |
276 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E 0x725e | 275 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E 0x725e |
277 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262 0x7262 | 276 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262 0x7262 |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 590aa379609c..d99b9593b65d 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[] = { | |||
1131 | { .driver_data = MT_CLS_EGALAX_SERIAL, | 1131 | { .driver_data = MT_CLS_EGALAX_SERIAL, |
1132 | MT_USB_DEVICE(USB_VENDOR_ID_DWAV, | 1132 | MT_USB_DEVICE(USB_VENDOR_ID_DWAV, |
1133 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, | 1133 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, |
1134 | { .driver_data = MT_CLS_EGALAX, | ||
1135 | HID_USB_DEVICE(USB_VENDOR_ID_DWAV, | ||
1136 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, | ||
1137 | { .driver_data = MT_CLS_EGALAX_SERIAL, | 1134 | { .driver_data = MT_CLS_EGALAX_SERIAL, |
1138 | MT_USB_DEVICE(USB_VENDOR_ID_DWAV, | 1135 | MT_USB_DEVICE(USB_VENDOR_ID_DWAV, |
1139 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) }, | 1136 | USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) }, |