Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 9f44d47530f13c49ae3641e8a976ed499f7ae707..b82b67d025b2a01221d880c5e00e30d4dd68148c 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -104,15 +104,22 @@ config LEDS_OMAP_PWM
 
 config LEDS_H1940
        tristate "LED Support for iPAQ H1940 device"
-       depends LEDS_CLASS && ARCH_H1940
+       depends on LEDS_CLASS && ARCH_H1940
        help
          This option enables support for the LEDs on the h1940.
 
-config LEDS_COBALT
-       tristate "LED Support for Cobalt Server front LED"
+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 Server
+         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"
@@ -122,6 +129,12 @@ config LEDS_GPIO
          outputs. To be useful the particular board must have LEDs
          and they must be connected to the GPIO lines.
 
+config LEDS_CM_X270
+       tristate "LED Support for the CM-X270 LEDs"
+       depends on LEDS_CLASS && MACH_ARMCORE
+       help
+         This option enables support for the CM-X270 LEDs.
+
 comment "LED Triggers"
 
 config LEDS_TRIGGERS