Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: move leds-clevo-mail's probe function to .devinit.text
  leds: Fix indentation in LEDS_LP3944 Kconfig entry
  leds: Fix LED names 
  leds: Fix leds-pca9532 whitespace issues
  leds: fix coding style in worker thread code for ledtrig-gpio.
  leds: gpio-leds: fix typographics fault
  leds: Add WM831x status LED driver

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 7c8e7122aaa9..e4f599f20e38 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -150,9 +150,9 @@ config LEDS_LP3944
         tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"
         depends on LEDS_CLASS && I2C
         help
-    This option enables support for LEDs connected to the National
-    Semiconductor LP3944 Lighting Management Unit (LMU) also known as
-    Fun Light Chip.
+          This option enables support for LEDs connected to the National
+          Semiconductor LP3944 Lighting Management Unit (LMU) also known as
+          Fun Light Chip.
 
           To compile this driver as a module, choose M here: the
           module will be called leds-lp3944.
@@ -195,6 +195,13 @@ config LEDS_PCA955X
           LED driver chips accessed via the I2C bus.  Supported
           devices include PCA9550, PCA9551, PCA9552, and PCA9553.
 
+config LEDS_WM831X_STATUS
+        tristate "LED support for status LEDs on WM831x PMICs"
+        depends on LEDS_CLASS && MFD_WM831X
+        help
+          This option enables support for the status LEDs of the WM831x
+          series of PMICs.
+
 config LEDS_WM8350
         tristate "LED Support for WM8350 AudioPlus PMIC"
         depends on LEDS_CLASS && MFD_WM8350