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 df50c25..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
@@ -322,6 +336,7 @@ config HID_MULTITOUCH
          - Stantum multitouch panels
          - Touch International Panels
          - Unitec Panels
+         - XAT optical touch panels
 
          If unsure, say N.
 
@@ -435,6 +450,7 @@ config HID_QUANTA
 config HID_ROCCAT
        tristate "Roccat special event support"
        depends on USB_HID
+       select HID_ROCCAT_COMMON
        ---help---
        Support for Roccat special events.
        Say Y here if you have a Roccat mouse or keyboard and want OSD or
@@ -442,44 +458,40 @@ config HID_ROCCAT
 
 config HID_ROCCAT_COMMON
        tristate
+       depends on HID_ROCCAT
 
 config HID_ROCCAT_ARVO
        tristate "Roccat Arvo keyboard support"
        depends on USB_HID
-       select HID_ROCCAT
-       select HID_ROCCAT_COMMON
+       depends on HID_ROCCAT
        ---help---
        Support for Roccat Arvo keyboard.
 
 config HID_ROCCAT_KONE
        tristate "Roccat Kone Mouse support"
        depends on USB_HID
-       select HID_ROCCAT
-       select HID_ROCCAT_COMMON
+       depends on HID_ROCCAT
        ---help---
        Support for Roccat Kone mouse.
 
 config HID_ROCCAT_KONEPLUS
        tristate "Roccat Kone[+] mouse support"
        depends on USB_HID
-       select HID_ROCCAT
-       select HID_ROCCAT_COMMON
+       depends on HID_ROCCAT
        ---help---
        Support for Roccat Kone[+] mouse.
 
 config HID_ROCCAT_KOVAPLUS
        tristate "Roccat Kova[+] mouse support"
        depends on USB_HID
-       select HID_ROCCAT
-       select HID_ROCCAT_COMMON
+       depends on HID_ROCCAT
        ---help---
        Support for Roccat Kova[+] mouse.
 
 config HID_ROCCAT_PYRA
        tristate "Roccat Pyra mouse support"
        depends on USB_HID
-       select HID_ROCCAT
-       select HID_ROCCAT_COMMON
+       depends on HID_ROCCAT
        ---help---
        Support for Roccat Pyra mouse.
 
@@ -495,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