Merge branch 'egalax' into for-linus
Jiri Kosina [Wed, 19 May 2010 12:26:44 +0000 (14:26 +0200)]
Conflicts:
drivers/hid/hid-ids.h

1  2 
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-quirks.c

Simple merge
Simple merge
Simple merge
  
  #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
@@@ -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 },