From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 23 Oct 2010 20:54:53 +0000 (+0200)
Subject: Merge branch 'waltop' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f1275410a108ac38b59149d10bce3f35edd70876;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'waltop' into for-linus
---

f1275410a108ac38b59149d10bce3f35edd70876
diff --cc drivers/hid/Kconfig
index 2685beebc8dc,4cae11e1ceb4..3052e2969ad0
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -182,8 -182,14 +182,14 @@@ config HID_UCLOGI
  	---help---
  	Support for UC-Logic tablets.
  
+ config HID_WALTOP
+ 	tristate "Waltop"
+ 	depends on USB_HID
+ 	---help---
+ 	Support for Waltop tablets.
+ 
  config HID_GYRATION
 -	tristate "Gyration"
 +	tristate "Gyration remote control"
  	depends on USB_HID
  	---help---
  	Support for Gyration remote control.
diff --cc drivers/hid/usbhid/hid-quirks.c
index 5457135d8ae3,9cc3dd1da90a..2c185477eeb3
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@ -70,10 -68,10 +70,12 @@@ static const struct hid_blacklist 
  	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
  	{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
  	{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT },
 +	{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U, HID_QUIRK_MULTI_INPUT },
 +	{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_KNA5, HID_QUIRK_MULTI_INPUT },
  	{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U, HID_QUIRK_MULTI_INPUT },
  	{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U, HID_QUIRK_MULTI_INPUT },
+ 	{ USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH, HID_QUIRK_MULTI_INPUT },
+ 	{ USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH, HID_QUIRK_MULTI_INPUT },
  	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
  	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },