]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'waltop' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:54:53 +0000 (22:54 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:54:53 +0000 (22:54 +0200)
1  2 
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-quirks.c

index 2685beebc8dc5e211c9f86f8485931b03f1fff98,4cae11e1ceb41e29b8df37d6b48bfb7e49e7a443..3052e2969ad03c049f77f4956ea804e60eea8123
@@@ -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.
Simple merge
Simple merge
Simple merge
index 5457135d8ae3d5710f0acf9a56a1683931d78ce4,9cc3dd1da90abe3da90f49f5cb6449ef65c9aca6..2c185477eeb3f7a61bdcdcd757ef5fcb728443f5
@@@ -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 },