Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

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

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index bdbc4f73fcdced7466406874737a373185aaf167..cea6cef27e893f36f96d168724e6befa5429e085 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,6 +29,13 @@ config APM_POWER
          Say Y here to enable support APM status emulation using
          battery class devices.
 
+config WM831X_POWER
+       tristate "WM831X PMU support"
+       depends on MFD_WM831X
+       help
+         Say Y here to enable support for the power management unit
+         provided by Wolfson Microelectronics WM831x PMICs.
+
 config WM8350_POWER
         tristate "WM8350 PMU support"
         depends on MFD_WM8350