Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6

[~andy/linux] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 80978196aae8b0a59d100a3bc09818dccdd6200b..49a89397231834a67fc1436026f563fadfe57e10 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -69,6 +69,12 @@ config TEST_POWER
        help
          This driver is used for testing. It's safe to say M here.
 
+config BATTERY_88PM860X
+       tristate "Marvell 88PM860x battery driver"
+       depends on MFD_88PM860X
+       help
+         Say Y here to enable battery monitor for Marvell 88PM860x chip.
+
 config BATTERY_DS2760
        tristate "DS2760 battery driver (HP iPAQ & others)"
        depends on W1 && W1_SLAVE_DS2760
@@ -174,7 +180,6 @@ config BATTERY_DA9030
 config BATTERY_DA9052
        tristate "Dialog DA9052 Battery"
        depends on PMIC_DA9052
-       depends on BROKEN
        help
          Say Y here to enable support for batteries charger integrated into
          DA9052 PMIC.
@@ -210,6 +215,12 @@ config BATTERY_S3C_ADC
        help
          Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
 
+config CHARGER_88PM860X
+       tristate "Marvell 88PM860x Charger driver"
+       depends on MFD_88PM860X && BATTERY_88PM860X
+       help
+         Say Y here to enable charger for Marvell 88PM860x chip.
+
 config CHARGER_PCF50633
        tristate "NXP PCF50633 MBC"
        depends on MFD_PCF50633
@@ -262,6 +273,13 @@ config CHARGER_LP8727
        help
          Say Y here to enable support for LP8727 Charger Driver.
 
+config CHARGER_LP8788
+       tristate "TI LP8788 charger driver"
+       depends on MFD_LP8788
+       depends on LP8788_ADC
+       help
+         Say Y to enable support for the LP8788 linear charger.
+
 config CHARGER_GPIO
        tristate "GPIO charger"
        depends on GPIOLIB