From: Jiri Kosina Date: Wed, 19 May 2010 12:26:44 +0000 (+0200) Subject: Merge branch 'egalax' into for-linus X-Git-Tag: firefly_0821_release~9833^2~2068^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77933c3;p=firefly-linux-kernel-4.4.55.git Merge branch 'egalax' into for-linus Conflicts: drivers/hid/hid-ids.h --- 77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 diff --cc drivers/hid/hid-ids.h index 7f4b94fbd7ce,413b16527f16..16c2f866821a --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@@ -179,8 -170,8 +179,9 @@@ #define USB_VENDOR_ID_DRAGONRISE 0x0079 - #define USB_VENDOR_ID_EGALAX 0x0EEF + #define USB_VENDOR_ID_DWAV 0x0eef +#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 + #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d #define USB_VENDOR_ID_ELO 0x04E7 #define USB_DEVICE_ID_ELO_TS2700 0x0020 diff --cc drivers/hid/usbhid/hid-quirks.c index 7a6bda23283e,1152f9b5fd44..5ff8d327f33a --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@@ -33,7 -33,6 +33,7 @@@ static const struct hid_blacklist { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD }, - { USB_VENDOR_ID_EGALAX, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT }, ++ { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },