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

[mirror_ubuntu-artful-kernel.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index dc9adfedabdf614fe5d531ee9f3e2b52c4e1bfbc..14ef6ab6979093605784dfe824c03ff931dd108c 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -217,6 +217,13 @@ config HID_ELECOM
        ---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
@@ -231,6 +238,9 @@ config HID_HOLTEK
        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"
@@ -240,6 +250,12 @@ config HOLTEK_FF
          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
@@ -561,15 +577,6 @@ config HID_PRIMAX
        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
@@ -594,12 +601,17 @@ config HID_SAMSUNG
        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"