Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555...

[deliverable/linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index cd8ce7e9d451c5ed546149072e8a9a63bf9c75ad..39b422b97ec00267d794909cf5724e1ce5b1fc58 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -78,6 +78,15 @@ config REGULATOR_ACT8865
          This driver controls a active-semi act8865 voltage output
          regulator via I2C bus.
 
+config REGULATOR_ACT8945A
+       tristate "Active-semi ACT8945A voltage regulator"
+       depends on MFD_ACT8945A
+       help
+         This driver controls a active-semi ACT8945A voltage regulator
+         via I2C bus. The ACT8945A features three step-down DC/DC converters
+         and four low-dropout linear regulators, along with a ActivePath
+         battery charger.
+
 config REGULATOR_AD5398
        tristate "Analog Devices AD5398/AD5821 regulators"
        depends on I2C