Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  gpio-charger: Fix checking return value of request_any_context_irq
  power_supply: MAX17042: Support additional properties
  max8903_charger: Allow platform data to be __initdata
  power_supply: Add charger driver for MAX8998/LP3974
  power_supply: Add charger driver for MAX8997/8966
  max17042_battery: Remove obsolete cleanup for clientdata
  twl4030_charger: Fix warnings
  wm831x_power: Support multiple instances
  wm831x_backup: Support multiple instances
  apm_power: Fix style error in macros
  s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()
  bq20z75: Enable detection after registering
  bq20z75: Add support for external notification

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index e57b50b38565..57de051a74b3 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -235,4 +235,18 @@ config CHARGER_GPIO
           This driver can be build as a module. If so, the module will be
           called gpio-charger.
 
+config CHARGER_MAX8997
+        tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"
+        depends on MFD_MAX8997 && REGULATOR_MAX8997
+        help
+          Say Y to enable support for the battery charger control sysfs and
+          platform data of MAX8997/LP3974 PMICs.
+
+config CHARGER_MAX8998
+        tristate "Maxim MAX8998/LP3974 PMIC battery charger driver"
+        depends on MFD_MAX8998 && REGULATOR_MAX8998
+        help
+          Say Y to enable support for the battery charger control sysfs and
+          platform data of MAX8998/LP3974 PMICs.
+
 endif # POWER_SUPPLY