Merge branch 'master'

[powerpc.git] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index d9e2f98..3f5b647 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -14,13 +14,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"
@@ -52,6 +46,30 @@ config LEDS_IXP4XX
          particular board must have LEDs and they must be connected
          to the GPIO lines.  If unsure, say Y.
 
+config LEDS_TOSA
+       tristate "LED Support for the Sharp SL-6000 series"
+       depends LEDS_CLASS && PXA_SHARPSL
+       help
+         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.
+
+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
@@ -59,5 +77,12 @@ config LEDS_TRIGGER_TIMER
          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
+       help
+         This allows LEDs to be controlled by IDE disk activity.
+         If unsure, say Y.
+
 endmenu