Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

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

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 23f0d5e..713d43b 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -1,3 +1,10 @@
+config LEDS_GPIO_REGISTER
+       bool
+       help
+         This option provides the function gpio_led_register_device.
+         As this function is used by arch code it must not be compiled as a
+         module.
+

 menuconfig NEW_LEDS
        bool "LED Support"
        help
 menuconfig NEW_LEDS
        bool "LED Support"
        help


@@ -7,22 +14,14 @@ menuconfig NEW_LEDS
          This is not related to standard keyboard LEDs which are controlled
          via the input system.
 
          This is not related to standard keyboard LEDs which are controlled
          via the input system.
 

+if NEW_LEDS
+

 config LEDS_CLASS
        bool "LED Class Support"
 config LEDS_CLASS
        bool "LED Class Support"

-       depends on NEW_LEDS

        help
          This option enables the led sysfs class in /sys/class/leds.  You'll
          need this to do anything useful with LEDs.  If unsure, say N.
 
        help
          This option enables the led sysfs class in /sys/class/leds.  You'll
          need this to do anything useful with LEDs.  If unsure, say N.
 

-config LEDS_GPIO_REGISTER
-       bool
-       help
-         This option provides the function gpio_led_register_device.
-         As this function is used by arch code it must not be compiled as a
-         module.
-
-if NEW_LEDS
-

 comment "LED drivers"
 
 config LEDS_88PM860X
 comment "LED drivers"
 
 config LEDS_88PM860X


@@ -391,6 +390,7 @@ config LEDS_NETXBIG
 
 config LEDS_ASIC3
        bool "LED support for the HTC ASIC3"
 
 config LEDS_ASIC3
        bool "LED support for the HTC ASIC3"

+       depends on LEDS_CLASS

        depends on MFD_ASIC3
        default y
        help
        depends on MFD_ASIC3
        default y
        help