Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 2c4f20b..9c39b98 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -4,8 +4,11 @@ menu "LED devices"
 config NEW_LEDS
        bool "LED Support"
        help
-         Say Y to enable Linux LED support.  This is not related to standard
-         keyboard LEDs which are controlled via the input system.
+         Say Y to enable Linux LED support.  This allows control of supported
+         LEDs from both userspace and optionally, by kernel events (triggers).
+
+         This is not related to standard keyboard LEDs which are controlled
+         via the input system.
 
 config LEDS_CLASS
        tristate "LED Class Support"
@@ -14,13 +17,7 @@ config LEDS_CLASS
          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_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
-         be configured via sysfs. If unsure, say Y.
+comment "LED drivers"
 
 config LEDS_CORGI
        tristate "LED Support for the Sharp SL-C7x0 series"
@@ -59,6 +56,36 @@ config LEDS_TOSA
          This option enables support for the LEDs on Sharp Zaurus
          SL-6000 series.
 
+config LEDS_S3C24XX
+       tristate "LED Support for Samsung S3C24XX GPIO LEDs"
+       depends on LEDS_CLASS && ARCH_S3C2410
+       help
+         This option enables support for LEDs connected to GPIO lines
+         on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.
+
+config LEDS_AMS_DELTA
+       tristate "LED Support for the Amstrad Delta (E3)"
+       depends LEDS_CLASS && MACH_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.
+
+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
+         be configured via sysfs. If unsure, say Y.
+
 config LEDS_TRIGGER_TIMER
        tristate "LED Timer Trigger"
        depends LEDS_TRIGGERS
@@ -67,11 +94,20 @@ config LEDS_TRIGGER_TIMER
          via sysfs. If unsure, say Y.
 
 config LEDS_TRIGGER_IDE_DISK
-       bool "LED Timer Trigger"
+       bool "LED IDE Disk Trigger"
        depends 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
+       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