Merge remote-tracking branches 'regulator/topic/ltc3589', 'regulator/topic/max77620...

[linux-2.6-block.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 39b422b97ec00267d794909cf5724e1ce5b1fc58..91040ec8e2427bc6e8f3dab6a27a80959afea450 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -360,6 +360,15 @@ config REGULATOR_MAX1586
          regulator via I2C bus. The provided regulator is suitable
          for PXA27x chips to control VCC_CORE and VCC_USIM voltages.
 
+config REGULATOR_MAX77620
+       tristate "Maxim 77620/MAX20024 voltage regulator"
+       depends on MFD_MAX77620
+       help
+         This driver controls Maxim MAX77620 voltage output regulator
+         via I2C bus. The provided regulator is suitable for Tegra
+         chip to control Step-Down DC-DC and LDOs. Say Y here to
+         enable the regulator driver.
+
 config REGULATOR_MAX8649
        tristate "Maxim 8649 voltage regulator"
        depends on I2C