Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus

[pandora-kernel.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 14ba3e2..306b15f 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -172,6 +172,20 @@ config HID_EZKEY
        ---help---
        Support for Ezkey BTC 8193 keyboard.
 
+config HID_HOLTEK
+       tristate "Holtek On Line Grip based game controller support"
+       depends on USB_HID
+       ---help---
+         Say Y here if you have a Holtek On Line Grip based game controller.
+
+config HOLTEK_FF
+       bool "Holtek On Line Grip force feedback support"
+       depends on HID_HOLTEK
+       select INPUT_FF_MEMLESS
+       ---help---
+         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_KEYTOUCH
        tristate "Keytouch HID devices"
        depends on USB_HID
@@ -305,6 +319,7 @@ config HID_MULTITOUCH
          - 3M PCT touch screens
          - ActionStar dual touch panels
          - Cando dual touch panels
+         - Chunghwa panels
          - CVTouch panels
          - Cypress TrueTouch panels
          - Elo TouchSystems IntelliTouch Plus panels
@@ -321,6 +336,7 @@ config HID_MULTITOUCH
          - Stantum multitouch panels
          - Touch International Panels
          - Unitec Panels
+         - XAT optical touch panels
 
          If unsure, say N.
 
@@ -491,6 +507,12 @@ config HID_SONY
        ---help---
        Support for Sony PS3 controller.
 
+config HID_SPEEDLINK
+       tristate "Speedlink VAD Cezanne mouse support"
+       depends on USB_HID
+       ---help---
+       Support for Speedlink Vicious and Divine Cezanne mouse.
+
 config HID_SUNPLUS
        tristate "Sunplus wireless desktop"
        depends on USB_HID
@@ -564,6 +586,12 @@ config HID_WACOM_POWER_SUPPLY
          Say Y here if you want to enable power supply status monitoring for
          Wacom Bluetooth devices.
 
+config HID_WIIMOTE
+       tristate "Nintendo Wii Remote support"
+       depends on BT_HIDP
+       ---help---
+       Support for the Nintendo Wii Remote bluetooth device.
+
 config HID_ZEROPLUS
        tristate "Zeroplus based game controller support"
        depends on USB_HID