Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus

diff --combined drivers/hid/Kconfig
index e25fb9829729729d0ad59beb25627d62a7b06a83,fb52f3f6de80a377112ea0af5dfb8153772cc14e,dc9adfedabdf614fe5d531ee9f3e2b52c4e1bfbc..14ef6ab6979093605784dfe824c03ff931dd108c
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@ -217,13 -217,6 -217,6 +217,13 @@@@ config HID_ELECO
        ---help---
        Support for the ELECOM BM084 (bluetooth mouse).
   
 ++config HID_ELO
 ++     tristate "ELO USB 4000/4500 touchscreen"
 ++     depends on USB_HID
 ++     ---help---
 ++     Support for the ELO USB 4000/4500 touchscreens. Note that this is for
 ++     different devices than those handled by CONFIG_TOUCHSCREEN_USB_ELO.
 ++
   config HID_EZKEY
        tristate "Ezkey BTC 8193 keyboard" if EXPERT
        depends on HID
@@@@ -238,9 -231,6 -231,6 +238,9 @@@@ config HID_HOLTE
        Support for Holtek based devices:
          - Holtek On Line Grip based game controller
          - Trust GXT 18 Gaming Keyboard
 ++       - Sharkoon Drakonia / Perixx MX-2000 gaming mice
 ++       - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 /
 ++         Zalman ZM-GM1
   
   config HOLTEK_FF
        bool "Holtek On Line Grip force feedback support"
@@@@ -250,12 -240,6 -240,6 +250,12 @@@@
          Say Y here if you have a Holtek On Line Grip based game controller
          and want to have force feedback support for it.
   
 ++config HID_HUION
 ++     tristate "Huion tablets"
 ++     depends on USB_HID
 ++     ---help---
 ++     Support for Huion 580 tablet.
 ++
   config HID_KEYTOUCH
        tristate "Keytouch HID devices"
        depends on HID
@@@@ -577,6 -561,15 -561,15 +577,6 @@@@ config HID_PRIMA
        Support for Primax devices that are not fully compliant with the
        HID standard.
   
 --config HID_PS3REMOTE
 --     tristate "Sony PS3 BD Remote Control"
 --     depends on HID
 --     ---help---
 --     Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech
 --     Harmony Adapter for PS3, which connect over Bluetooth.
 --
 --     Support for the 6-axis controllers is provided by HID_SONY.
 --
   config HID_ROCCAT
        tristate "Roccat device support"
        depends on USB_HID
@@@@ -601,17 -594,12 -594,12 +601,17 @@@@ config HID_SAMSUN
        Support for Samsung InfraRed remote control or keyboards.
   
   config HID_SONY
 --     tristate "Sony PS3 controller"
 ++     tristate "Sony PS2/3 accessories"
        depends on USB_HID
 ++     depends on NEW_LEDS
 ++     depends on LEDS_CLASS
        ---help---
 --     Support for Sony PS3 6-axis controllers.
 ++     Support for
   
 --     Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.
 ++       * Sony PS3 6-axis controllers
 ++       * Buzz controllers
 ++       * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
 ++       * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
   
   config HID_SPEEDLINK
        tristate "Speedlink VAD Cezanne mouse support"
@@@@ -719,22 -707,22 -707,29 +719,29 @@@@ config HID_WACO
        Support for Wacom Graphire Bluetooth and Intuos4 WL tablets.
   
   config HID_WIIMOTE
--      tristate "Nintendo Wii Remote support"
++      tristate "Nintendo Wii / Wii U peripherals"
        depends on HID
        depends on LEDS_CLASS
        select POWER_SUPPLY
        select INPUT_FF_MEMLESS
        ---help---
--      Support for the Nintendo Wii Remote bluetooth device.
++      Support for Nintendo Wii and Wii U Bluetooth peripherals. Supported
++      devices are the Wii Remote and its extension devices, but also devices
++      based on the Wii Remote like the Wii U Pro Controller or the
++      Wii Balance Board.
   
-- config HID_WIIMOTE_EXT
--      bool "Nintendo Wii Remote Extension support"
--      depends on HID_WIIMOTE
--      default HID_WIIMOTE
--      ---help---
--      Support for extension controllers of the Nintendo Wii Remote. Say yes
--      here if you want to use the Nintendo Motion+, Nunchuck or Classic
--      extension controllers with your Wii Remote.
++      Support for all official Nintendo extensions is available, however, 3rd
++      party extensions might not be supported. Please report these devices to:
++        http://github.com/dvdhrm/xwiimote/issues
++ 
++      Other Nintendo Wii U peripherals that are IEEE 802.11 based (including
++      the Wii U Gamepad) might be supported in the future. But currently
++      support is limited to Bluetooth based devices.
++ 
++      If unsure, say N.
++ 
++      To compile this driver as a module, choose M here: the
++      module will be called hid-wiimote.
   
   config HID_ZEROPLUS
        tristate "Zeroplus based game controller support"

diff --combined drivers/hid/Makefile
index ffd0d9826d84b91feb9a2bba86684dfac1569f9a,2065694f57abe482693371988781421404a2485e,6a1215b87be3c3d98e18ff3e656db19ee030940b..6f687287e2125168fbfa46ab0f8d9384a08dc797
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
--- 3/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@ -28,10 -28,10 -28,7 +28,7 @@@@ ifdef CONFIG_LOGIWHEELS_F
        hid-logitech-y  += hid-lg4ff.o
   endif
   
-- hid-wiimote-y                := hid-wiimote-core.o
-- ifdef CONFIG_HID_WIIMOTE_EXT
--      hid-wiimote-y   += hid-wiimote-ext.o
-- endif
++ hid-wiimote-y                := hid-wiimote-core.o hid-wiimote-modules.o
   ifdef CONFIG_DEBUG_FS
        hid-wiimote-y   += hid-wiimote-debug.o
   endif
@@@@ -48,13 -48,10 -45,10 +45,13 @@@@ obj-$(CONFIG_HID_CYPRESS) += hid-cypres
   obj-$(CONFIG_HID_DRAGONRISE) += hid-dr.o
   obj-$(CONFIG_HID_EMS_FF)     += hid-emsff.o
   obj-$(CONFIG_HID_ELECOM)     += hid-elecom.o
 ++obj-$(CONFIG_HID_ELO)                += hid-elo.o
   obj-$(CONFIG_HID_EZKEY)              += hid-ezkey.o
   obj-$(CONFIG_HID_GYRATION)   += hid-gyration.o
   obj-$(CONFIG_HID_HOLTEK)     += hid-holtek-kbd.o
 ++obj-$(CONFIG_HID_HOLTEK)     += hid-holtek-mouse.o
   obj-$(CONFIG_HID_HOLTEK)     += hid-holtekff.o
 ++obj-$(CONFIG_HID_HUION)              += hid-huion.o
   obj-$(CONFIG_HID_HYPERV_MOUSE)       += hid-hyperv.o
   obj-$(CONFIG_HID_ICADE)              += hid-icade.o
   obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
@@@@ -95,6 -92,7 -89,7 +92,6 @@@@ hid-picolcd-y                 += hid-picolcd_debugfs.
   endif
   
   obj-$(CONFIG_HID_PRIMAX)     += hid-primax.o
 --obj-$(CONFIG_HID_PS3REMOTE)  += hid-ps3remote.o
   obj-$(CONFIG_HID_ROCCAT)     += hid-roccat.o hid-roccat-common.o \
        hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
        hid-roccat-koneplus.o hid-roccat-konepure.o hid-roccat-kovaplus.o \