Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[sfrench/cifs-2.6.git] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index f573d5af0b1f35fe4c7f35d8babbc2ba68da0e0d..176142c61492c99c1f31a16c7f3572a381e1e006 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -69,6 +69,19 @@ config LEDS_AMS_DELTA
        help
          This option enables support for the LEDs on Amstrad Delta (E3).
 
+config LEDS_NET48XX
+       tristate "LED Support for Soekris net48xx series Error LED"
+       depends on LEDS_CLASS && SCx200_GPIO
+       help
+         This option enables support for the Soekris net4801 and net4826 error
+         LED.
+
+config LEDS_WRAP
+       tristate "LED Support for the WRAP series LEDs"
+       depends on LEDS_CLASS && SCx200_GPIO
+       help
+         This option enables support for the PCEngines WRAP programmable LEDs.
+
 comment "LED Triggers"
 
 config LEDS_TRIGGERS
@@ -93,5 +106,14 @@ config LEDS_TRIGGER_IDE_DISK
          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
+       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