Merge remote-tracking branches 'regulator/topic/tps65218', 'regulator/topic/tps6524x...

[pandora-kernel.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 8f3866c..1cd8584 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -535,6 +535,15 @@ config REGULATOR_TPS65217
          voltage regulators. It supports software based voltage control
          for different voltage domains
 
+config REGULATOR_TPS65218
+       tristate "TI TPS65218 Power regulators"
+       depends on MFD_TPS65218 && OF
+       help
+         This driver supports TPS65218 voltage regulator chips. TPS65218
+         provides six step-down converters and one general-purpose LDO
+         voltage regulators. It supports software based voltage control
+         for different voltage domains
+
 config REGULATOR_TPS6524X
        tristate "TI TPS6524X Power regulators"
        depends on SPI