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

[firefly-linux-kernel-4.4.55.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index ffe02fb7cbc78a64c40818d2a0323b07a1f7a515..0d0b5d7d19d02f9e2c0a245de4da43f084e3340e 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -340,6 +340,13 @@ config CHARGER_SMB347
          Say Y to include support for Summit Microelectronics SMB347
          Battery Charger.
 
+config CHARGER_TPS65090
+       tristate "TPS65090 battery charger driver"
+       depends on MFD_TPS65090
+       help
+        Say Y here to enable support for battery charging with TPS65090
+        PMIC chips.
+
 config AB8500_BM
        bool "AB8500 Battery Management Driver"
        depends on AB8500_CORE && AB8500_GPADC
@@ -353,13 +360,6 @@ config BATTERY_GOLDFISH
          Say Y to enable support for the battery and AC power in the
          Goldfish emulator.
 
-config CHARGER_PM2301
-       bool "PM2301 Battery Charger Driver"
-       depends on AB8500_BM
-       help
-         Say Y to include support for PM2301 charger driver.
-         Depends on AB8500 battery management core.
-
 source "drivers/power/reset/Kconfig"
 
 endif # POWER_SUPPLY