Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

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

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index c7ff1e11ea853c11dc70b25079f9ccc8b943280a..e7fb7d2fcbfc4792abc91993337620a562a3323c 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -113,11 +113,12 @@ config LEDS_GPIO
          outputs. To be useful the particular board must have LEDs
          and they must be connected to the GPIO lines.
 
          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
+config LEDS_HP_DISK
+       tristate "LED Support for disk protection LED on HP notebooks"
+       depends on LEDS_CLASS && ACPI

        help
        help

-         This option enables support for the CM-X270 LEDs.
+         This option enable support for disk protection LED, found on
+         newer HP notebooks.

 
 config LEDS_CLEVO_MAIL
        tristate "Mail LED on Clevo notebook (EXPERIMENTAL)"
 
 config LEDS_CLEVO_MAIL
        tristate "Mail LED on Clevo notebook (EXPERIMENTAL)"


@@ -157,6 +158,13 @@ config LEDS_PCA955X
          LED driver chips accessed via the I2C bus.  Supported
          devices include PCA9550, PCA9551, PCA9552, and PCA9553.
 
          LED driver chips accessed via the I2C bus.  Supported
          devices include PCA9550, PCA9551, PCA9552, and PCA9553.
 

+config LEDS_DA903X
+       tristate "LED Support for DA9030/DA9034 PMIC"
+       depends on LEDS_CLASS && PMIC_DA903X
+       help
+         This option enables support for on-chip LED drivers found
+         on Dialog Semiconductor DA9030/DA9034 PMICs.
+

 comment "LED Triggers"
 
 config LEDS_TRIGGERS
 comment "LED Triggers"
 
 config LEDS_TRIGGERS


@@ -193,6 +201,15 @@ config LEDS_TRIGGER_HEARTBEAT
          load average.
          If unsure, say Y.
 
          load average.
          If unsure, say Y.
 

+config LEDS_TRIGGER_BACKLIGHT
+       tristate "LED backlight Trigger"
+       depends on LEDS_TRIGGERS
+       help
+         This allows LEDs to be controlled as a backlight device: they
+         turn off and on when the display is blanked and unblanked.
+
+         If unsure, say N.
+

 config LEDS_TRIGGER_DEFAULT_ON
        tristate "LED Default ON Trigger"
        depends on LEDS_TRIGGERS
 config LEDS_TRIGGER_DEFAULT_ON
        tristate "LED Default ON Trigger"
        depends on LEDS_TRIGGERS