---

yaml --- r: 165517 b: refs/heads/master c: 3961f7c h: refs/heads/master i: 165515: 019bec5 v: v3
git-mirror · Sep 4, 2009 · 1599501 · 1599501
1 parent c562a59
commit 1599501
Show file tree

Hide file tree

Showing 5 changed files with 977 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0525b48f06714e8d5cf6a3266261b71de8d6dd4
+refs/heads/master: 3961f7c3cf247eee5df7fabadc7a40f2deeb98f3
diff --git a/trunk/drivers/power/Kconfig b/trunk/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

diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_POWER_SUPPLY)	+= power_supply.o
 
 obj-$(CONFIG_PDA_POWER)		+= pda_power.o
 obj-$(CONFIG_APM_POWER)		+= apm_power.o
+obj-$(CONFIG_WM831X_POWER)	+= wm831x_power.o
 obj-$(CONFIG_WM8350_POWER)	+= wm8350_power.o
 
 obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_battery.o