Merge branch 'egalax' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
index 7f4b94fbd7ceb6e654f4202ebb30cf4530b5b3a3,413b16527f1683ea7a07b8648a934d4815453e99..16c2f866821a34788b4d618ba35af939f376da19
--- 1/drivers/hid/hid-ids.h
--- 2/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 7a6bda23283ee9fca633de3ce9fcbed82571376b,1152f9b5fd444c13492de3ae976ef644fb36c9f7..5ff8d327f33aae96c28594e29b7ff3b53e87e156
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/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 },