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

[firefly-linux-kernel-4.4.55.git] / drivers / leds / Kconfig

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 23408bd68fdc0c8b18f4e140bc367c2a07e53619..42990f2d03178885d6021bce5ef3a9315d70f447 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -170,6 +170,7 @@ config LEDS_SUNFIRE
 
 config LEDS_IPAQ_MICRO
        tristate "LED Support for the Compaq iPAQ h3xxx"
+       depends on LEDS_CLASS
        depends on MFD_IPAQ_MICRO
        help
          Choose this option if you want to use the notification LED on
@@ -229,7 +230,7 @@ config LEDS_LP55XX_COMMON
        tristate "Common Driver for TI/National LP5521/5523/55231/5562/8501"
        depends on LEDS_LP5521 || LEDS_LP5523 || LEDS_LP5562 || LEDS_LP8501
        select FW_LOADER
-       select FW_LOADER_USER_HELPER_FALLBACK
+       select FW_LOADER_USER_HELPER
        help
          This option supports common operations for LP5521/5523/55231/5562/8501
          devices.
@@ -565,6 +566,17 @@ config LEDS_BLINKM
          This option enables support for the BlinkM RGB LED connected
          through I2C. Say Y to enable support for the BlinkM LED.
 
+config LEDS_POWERNV
+       tristate "LED support for PowerNV Platform"
+       depends on LEDS_CLASS
+       depends on PPC_POWERNV
+       depends on OF
+       help
+         This option enables support for the system LEDs present on
+         PowerNV platforms. Say 'y' to enable this support in kernel.
+         To compile this driver as a module, choose 'm' here: the module
+         will be called leds-powernv.
+
 config LEDS_SYSCON
        bool "LED support for LEDs on system controllers"
        depends on LEDS_CLASS=y
@@ -583,14 +595,6 @@ 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"