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 d2c9734..2b006bf 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -69,7 +69,7 @@ config HID_ACRUX
        Say Y here if you want to enable support for ACRUX game controllers.
 
 config HID_ACRUX_FF
        Say Y here if you want to enable support for ACRUX game controllers.
 
 config HID_ACRUX_FF

-       tristate "ACRUX force feedback support"
+       bool "ACRUX force feedback support"

        depends on HID_ACRUX
        select INPUT_FF_MEMLESS
        ---help---
        depends on HID_ACRUX
        select INPUT_FF_MEMLESS
        ---help---


@@ -345,6 +345,7 @@ config HID_MULTITOUCH
          - Hanvon dual touch panels
          - Ilitek dual touch panels
          - IrTouch Infrared USB panels
          - 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
          - Lumio CrystalTouch panels
          - MosArt dual-touch panels
          - PenMount dual touch panels


@@ -606,6 +607,8 @@ config HID_WACOM_POWER_SUPPLY
 config HID_WIIMOTE
        tristate "Nintendo Wii Remote support"
        depends on BT_HIDP
 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.
 
        ---help---
        Support for the Nintendo Wii Remote bluetooth device.