kconfig: syntax cleanup - drop support for "depends/requires/def_boolean"

[safe/jmp/linux-2.6] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 176142c..c12bd66 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -1,8 +1,6 @@
-
-menu "LED devices"
-
-config NEW_LEDS
+menuconfig NEW_LEDS
        bool "LED Support"
+       depends on HAS_IOMEM
        help
          Say Y to enable Linux LED support.  This allows control of supported
          LEDs from both userspace and optionally, by kernel events (triggers).
@@ -10,9 +8,10 @@ config NEW_LEDS
          This is not related to standard keyboard LEDs which are controlled
          via the input system.
 
+if NEW_LEDS
+
 config LEDS_CLASS
        tristate "LED Class Support"
-       depends 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.
@@ -21,28 +20,28 @@ comment "LED drivers"
 
 config LEDS_CORGI
        tristate "LED Support for the Sharp SL-C7x0 series"
-       depends LEDS_CLASS && PXA_SHARP_C7xx
+       depends on LEDS_CLASS && PXA_SHARP_C7xx
        help
          This option enables support for the LEDs on Sharp Zaurus
          SL-C7x0 series (C700, C750, C760, C860).
 
 config LEDS_LOCOMO
        tristate "LED Support for Locomo device"
-       depends LEDS_CLASS && SHARP_LOCOMO
+       depends on LEDS_CLASS && SHARP_LOCOMO
        help
          This option enables support for the LEDs on Sharp Locomo.
          Zaurus models SL-5500 and SL-5600.
 
 config LEDS_SPITZ
        tristate "LED Support for the Sharp SL-Cxx00 series"
-       depends LEDS_CLASS && PXA_SHARP_Cxx00
+       depends on LEDS_CLASS && PXA_SHARP_Cxx00
        help
          This option enables support for the LEDs on Sharp Zaurus
          SL-Cxx00 series (C1000, C3000, C3100).
 
 config LEDS_IXP4XX
        tristate "LED Support for GPIO connected LEDs on IXP4XX processors"
-       depends LEDS_CLASS && ARCH_IXP4XX
+       depends on LEDS_CLASS && ARCH_IXP4XX
        help
          This option enables support for the LEDs connected to GPIO
          outputs of the Intel IXP4XX processors.  To be useful the
@@ -51,7 +50,7 @@ config LEDS_IXP4XX
 
 config LEDS_TOSA
        tristate "LED Support for the Sharp SL-6000 series"
-       depends LEDS_CLASS && PXA_SHARPSL
+       depends on LEDS_CLASS && PXA_SHARPSL
        help
          This option enables support for the LEDs on Sharp Zaurus
          SL-6000 series.
@@ -65,7 +64,7 @@ config LEDS_S3C24XX
 
 config LEDS_AMS_DELTA
        tristate "LED Support for the Amstrad Delta (E3)"
-       depends LEDS_CLASS && MACH_AMS_DELTA
+       depends on LEDS_CLASS && MACH_AMS_DELTA
        help
          This option enables support for the LEDs on Amstrad Delta (E3).
 
@@ -82,11 +81,37 @@ config LEDS_WRAP
        help
          This option enables support for the PCEngines WRAP programmable LEDs.
 
+config LEDS_H1940
+       tristate "LED Support for iPAQ H1940 device"
+       depends on LEDS_CLASS && ARCH_H1940
+       help
+         This option enables support for the LEDs on the h1940.
+
+config LEDS_COBALT_QUBE
+       tristate "LED Support for the Cobalt Qube series front LED"
+       depends on LEDS_CLASS && MIPS_COBALT
+       help
+         This option enables support for the front LED on Cobalt Qube series
+
+config LEDS_COBALT_RAQ
+       bool "LED Support for the Cobalt Raq series"
+       depends on LEDS_CLASS && MIPS_COBALT
+       select LEDS_TRIGGERS
+       help
+         This option enables support for the Cobalt Raq series LEDs.
+
+config LEDS_GPIO
+       tristate "LED Support for GPIO connected LEDs"
+       depends on LEDS_CLASS && GENERIC_GPIO
+       help
+         This option enables support for the LEDs connected to GPIO
+         outputs. To be useful the particular board must have LEDs
+         and they must be connected to the GPIO lines.
+
 comment "LED Triggers"
 
 config LEDS_TRIGGERS
        bool "LED Trigger support"
-       depends NEW_LEDS
        help
          This option enables trigger support for the leds class.
          These triggers allow kernel events to drive the LEDs and can
@@ -94,26 +119,25 @@ config LEDS_TRIGGERS
 
 config LEDS_TRIGGER_TIMER
        tristate "LED Timer Trigger"
-       depends LEDS_TRIGGERS
+       depends on LEDS_TRIGGERS
        help
          This allows LEDs to be controlled by a programmable timer
          via sysfs. If unsure, say Y.
 
 config LEDS_TRIGGER_IDE_DISK
        bool "LED IDE Disk Trigger"
-       depends LEDS_TRIGGERS && BLK_DEV_IDEDISK
+       depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
        help
          This allows LEDs to be controlled by IDE disk activity.
          If unsure, say Y.
 
 config LEDS_TRIGGER_HEARTBEAT
        tristate "LED Heartbeat Trigger"
-       depends LEDS_TRIGGERS
+       depends on LEDS_TRIGGERS
        help
          This allows LEDs to be controlled by a CPU load average.
          The flash frequency is a hyperbolic function of the 1-minute
          load average.
          If unsure, say Y.
 
-endmenu
-
+endif # NEW_LEDS