Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into...

[karo-tx-linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 8280eba43e149eddc9789034a393e176d5d20b5a..e25fb9829729729d0ad59beb25627d62a7b06a83 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