Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for...

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 342be43..2b006bf 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -245,6 +245,15 @@ config HID_LOGITECH
        ---help---
        Support for Logitech devices that are not fully compliant with HID standard.
 
+config HID_LOGITECH_DJ
+       tristate "Logitech Unifying receivers full support"
+       depends on HID_LOGITECH
+       default m
+       ---help---
+       Say Y if you want support for Logitech Unifying receivers and devices.
+       Unifying receivers are capable of pairing up to 6 Logitech compliant
+       devices to the same receiver.
+
 config LOGITECH_FF
        bool "Logitech force feedback support"
        depends on HID_LOGITECH
@@ -278,13 +287,21 @@ config LOGIG940_FF
          Say Y here if you want to enable force feedback support for Logitech
          Flight System G940 devices.
 
-config LOGIWII_FF
-       bool "Logitech Speed Force Wireless force feedback support"
+config LOGIWHEELS_FF
+       bool "Logitech wheels configuration and force feedback support"
        depends on HID_LOGITECH
        select INPUT_FF_MEMLESS
+       default LOGITECH_FF
        help
-         Say Y here if you want to enable force feedback support for Logitech
-         Speed Force Wireless (Wii) devices.
+         Say Y here if you want to enable force feedback and range setting
+         support for following Logitech wheels:
+         - Logitech Driving Force
+         - Logitech Driving Force Pro
+         - Logitech Driving Force GT
+         - Logitech G25
+         - Logitech G27
+         - Logitech MOMO/MOMO 2
+         - Logitech Formula Force EX
 
 config HID_MAGICMOUSE
        tristate "Apple MagicMouse multi-touch support"
@@ -328,6 +345,7 @@ config HID_MULTITOUCH
          - Hanvon dual touch panels
          - Ilitek dual touch panels
          - IrTouch Infrared USB panels
+         - LG Display panels (Dell ST2220Tc)
          - Lumio CrystalTouch panels
          - MosArt dual-touch panels
          - PenMount dual touch panels
@@ -589,6 +607,8 @@ config HID_WACOM_POWER_SUPPLY
 config HID_WIIMOTE
        tristate "Nintendo Wii Remote support"
        depends on BT_HIDP
+       depends on LEDS_CLASS
+       select POWER_SUPPLY
        ---help---
        Support for the Nintendo Wii Remote bluetooth device.