Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mirror_ubuntu-hirsute-kernel.git] / drivers / leds / trigger / Kconfig

diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
index 5bda6a9b56bbd90b4a3749f87bc0c6fda8dd5034..9893d911390daa4dd77986065ebde50b517d6b72 100644 (file)
--- a/drivers/leds/trigger/Kconfig
+++ b/drivers/leds/trigger/Kconfig
@@ -41,6 +41,14 @@ config LEDS_TRIGGER_IDE_DISK
          This allows LEDs to be controlled by IDE disk activity.
          If unsure, say Y.
 
+config LEDS_TRIGGER_MTD
+       bool "LED MTD (NAND/NOR) Trigger"
+       depends on MTD
+       depends on LEDS_TRIGGERS
+       help
+         This allows LEDs to be controlled by MTD activity.
+         If unsure, say N.
+
 config LEDS_TRIGGER_HEARTBEAT
        tristate "LED Heartbeat Trigger"
        depends on LEDS_TRIGGERS
@@ -108,4 +116,14 @@ config LEDS_TRIGGER_CAMERA
          This enables direct flash/torch on/off by the driver, kernel space.
          If unsure, say Y.
 
+config LEDS_TRIGGER_PANIC
+       bool "LED Panic Trigger"
+       depends on LEDS_TRIGGERS
+       help
+         This allows LEDs to be configured to blink on a kernel panic.
+         Enabling this option will allow to mark certain LEDs as panic indicators,
+         allowing to blink them on a kernel panic, even if they are set to
+         a different trigger.
+         If unsure, say Y.
+
 endif # LEDS_TRIGGERS