---

yaml --- r: 186907 b: refs/heads/master c: 28db388 h: refs/heads/master i: 186905: 793bf18 186903: cb15789 v: v3
git-mirror · Mar 7, 2010 · bc47122 · bc47122
1 parent f9ca5be
commit bc47122
Show file tree

Hide file tree

Showing 4 changed files with 543 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a39069f6ce6500a5ca39e534108247f25169d8e0
+refs/heads/master: 28db38888b2a53b6bdd70104c2d2a199632ca507
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 MAX8925_POWER
+	tristate "MAX8925 battery charger support"
+	depends on MFD_MAX8925
+	help
+	  Say Y here to enable support for the battery charger in the Maxim
+	  MAX8925 PMIC.
+
 config WM831X_BACKUP
 	tristate "WM831X backup battery charger support"
 	depends on MFD_WM831X

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_MAX8925_POWER)	+= max8925_power.o
 obj-$(CONFIG_WM831X_BACKUP)	+= wm831x_backup.o
 obj-$(CONFIG_WM831X_POWER)	+= wm831x_power.o
 obj-$(CONFIG_WM8350_POWER)	+= wm8350_power.o