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

[linux-2.6] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 859814f62cb07e5f1e14ea71c012a70560e988e9..86a369bc57d6d91c9137da6940904d6172cf9f90 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -1,6 +1,5 @@
 menuconfig NEW_LEDS
        bool "LED Support"
-       depends on HAS_IOMEM
        help
          Say Y to enable Linux LED support.  This allows control of supported
          LEDs from both userspace and optionally, by kernel events (triggers).
@@ -46,13 +45,6 @@ config LEDS_SPITZ
          This option enables support for the LEDs on Sharp Zaurus
          SL-Cxx00 series (C1000, C3000, C3100).
 
-config LEDS_TOSA
-       tristate "LED Support for the Sharp SL-6000 series"
-       depends on 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
@@ -73,6 +65,12 @@ config LEDS_NET48XX
          This option enables support for the Soekris net4801 and net4826 error
          LED.
 
+config LEDS_FSG
+       tristate "LED Support for the Freecom FSG-3"
+       depends on LEDS_CLASS && MACH_FSG
+       help
+         This option enables support for the LEDs on the Freecom FSG-3.
+
 config LEDS_WRAP
        tristate "LED Support for the WRAP series LEDs"
        depends on LEDS_CLASS && SCx200_GPIO
@@ -135,6 +133,7 @@ config LEDS_CLEVO_MAIL
 
          This module can drive the mail LED for the following notebooks:
 
+               Clevo D400P
                Clevo D410J
                Clevo D410V
                Clevo D400V/D470V (not tested, but might work)
@@ -142,6 +141,9 @@ config LEDS_CLEVO_MAIL
                Clevo M5x0N (not tested, but might work)
                Positivo Mobile (Clevo M5x0V)
 
+         If your model is not listed here you can try the "nodetect"
+         module paramter.
+
          To compile this driver as a module, choose M here: the
          module will be called leds-clevo-mail.
 
@@ -181,4 +183,11 @@ config LEDS_TRIGGER_HEARTBEAT
          load average.
          If unsure, say Y.
 
+config LEDS_TRIGGER_DEFAULT_ON
+       tristate "LED Default ON Trigger"
+       depends on LEDS_TRIGGERS
+       help
+         This allows LEDs to be initialised in the ON state.
+         If unsure, say Y.
+
 endif # NEW_LEDS