diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 16:50:11 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 16:50:11 +0400 |
| commit | 099c60622417c25b5454061a54cedf5b5132650d (patch) | |
| tree | 2046deadcf15c12a79f74ddacc0b7598a9e7c5db | |
| parent | 724d054490883fed2d7e5fc716dffa7675476740 (diff) | |
| parent | 613965fb49d507faa189ebf31767a907d98bb7fd (diff) | |
| download | linux-099c60622417c25b5454061a54cedf5b5132650d.tar.xz | |
Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next
| -rw-r--r-- | drivers/regulator/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 4a5367e3b6c3..6845d7439c23 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -75,7 +75,7 @@ config REGULATOR_88PM800 various voltages. config REGULATOR_88PM8607 - bool "Marvell 88PM8607 Power regulators" + tristate "Marvell 88PM8607 Power regulators" depends on MFD_88PM860X=y help This driver supports 88PM8607 voltage regulator chips. @@ -230,8 +230,8 @@ config REGULATOR_LP3972 on National Semiconductors LP3972 PMIC config REGULATOR_LP872X - bool "TI/National Semiconductor LP8720/LP8725 voltage regulators" - depends on I2C=y + tristate "TI/National Semiconductor LP8720/LP8725 voltage regulators" + depends on I2C select REGMAP_I2C help This driver supports LP8720/LP8725 PMIC @@ -246,7 +246,7 @@ config REGULATOR_LP8755 9 mode multiphase configuration. config REGULATOR_LP8788 - bool "TI LP8788 Power Regulators" + tristate "TI LP8788 Power Regulators" depends on MFD_LP8788 help This driver supports LP8788 voltage regulator chip. @@ -412,7 +412,7 @@ config REGULATOR_S5M8767 supports DVS mode with 8bits of output voltage control. config REGULATOR_TI_ABB - bool "TI Adaptive Body Bias on-chip LDO" + tristate "TI Adaptive Body Bias on-chip LDO" depends on ARCH_OMAP help Select this option to support Texas Instruments' on-chip Adaptive Body @@ -522,7 +522,7 @@ config REGULATOR_TPS80031 output to control regulators. config REGULATOR_TWL4030 - bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC" + tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC" depends on TWL4030_CORE help This driver supports the voltage regulators provided by |