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

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 6008e634853e3045d0df31684e511a361f999cd5..306b15f39c9c12a8e717699c0d1c25fe396aa714 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -319,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
@@ -449,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
@@ -456,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.
 
@@ -588,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