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

[karo-tx-linux.git] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 25b320d64e2609cfa1380e316ae7fee74f1e9cbd..4191614c4651eaef0e3d58dffa2008e737ad877b 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -11,9 +11,6 @@ menuconfig NEW_LEDS
          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.
-
 if NEW_LEDS
 
 config LEDS_CLASS
@@ -526,6 +523,14 @@ config LEDS_VERSATILE
          This option enabled support for the LEDs on the ARM Versatile
          and RealView boards. Say Y to enabled these.
 
+config LEDS_PM8941_WLED
+       tristate "LED support for the Qualcomm PM8941 WLED block"
+       depends on LEDS_CLASS
+       select REGMAP
+       help
+         This option enables support for the 'White' LED block
+         on Qualcomm PM8941 PMICs.
+
 comment "LED Triggers"
 source "drivers/leds/trigger/Kconfig"