diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:11 -0400 |
| commit | 099c60622417c25b5454061a54cedf5b5132650d (patch) | |
| tree | 2046deadcf15c12a79f74ddacc0b7598a9e7c5db /drivers/regulator/Kconfig | |
| parent | 724d054490883fed2d7e5fc716dffa7675476740 (diff) | |
| parent | 613965fb49d507faa189ebf31767a907d98bb7fd (diff) | |
Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next
Diffstat (limited to 'drivers/regulator/Kconfig')
| -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 | |||
| 75 | various voltages. | 75 | various voltages. |
| 76 | 76 | ||
| 77 | config REGULATOR_88PM8607 | 77 | config REGULATOR_88PM8607 |
| 78 | bool "Marvell 88PM8607 Power regulators" | 78 | tristate "Marvell 88PM8607 Power regulators" |
| 79 | depends on MFD_88PM860X=y | 79 | depends on MFD_88PM860X=y |
| 80 | help | 80 | help |
| 81 | This driver supports 88PM8607 voltage regulator chips. | 81 | This driver supports 88PM8607 voltage regulator chips. |
| @@ -230,8 +230,8 @@ config REGULATOR_LP3972 | |||
| 230 | on National Semiconductors LP3972 PMIC | 230 | on National Semiconductors LP3972 PMIC |
| 231 | 231 | ||
| 232 | config REGULATOR_LP872X | 232 | config REGULATOR_LP872X |
| 233 | bool "TI/National Semiconductor LP8720/LP8725 voltage regulators" | 233 | tristate "TI/National Semiconductor LP8720/LP8725 voltage regulators" |
| 234 | depends on I2C=y | 234 | depends on I2C |
| 235 | select REGMAP_I2C | 235 | select REGMAP_I2C |
| 236 | help | 236 | help |
| 237 | This driver supports LP8720/LP8725 PMIC | 237 | This driver supports LP8720/LP8725 PMIC |
| @@ -246,7 +246,7 @@ config REGULATOR_LP8755 | |||
| 246 | 9 mode multiphase configuration. | 246 | 9 mode multiphase configuration. |
| 247 | 247 | ||
| 248 | config REGULATOR_LP8788 | 248 | config REGULATOR_LP8788 |
| 249 | bool "TI LP8788 Power Regulators" | 249 | tristate "TI LP8788 Power Regulators" |
| 250 | depends on MFD_LP8788 | 250 | depends on MFD_LP8788 |
| 251 | help | 251 | help |
| 252 | This driver supports LP8788 voltage regulator chip. | 252 | This driver supports LP8788 voltage regulator chip. |
| @@ -412,7 +412,7 @@ config REGULATOR_S5M8767 | |||
| 412 | supports DVS mode with 8bits of output voltage control. | 412 | supports DVS mode with 8bits of output voltage control. |
| 413 | 413 | ||
| 414 | config REGULATOR_TI_ABB | 414 | config REGULATOR_TI_ABB |
| 415 | bool "TI Adaptive Body Bias on-chip LDO" | 415 | tristate "TI Adaptive Body Bias on-chip LDO" |
| 416 | depends on ARCH_OMAP | 416 | depends on ARCH_OMAP |
| 417 | help | 417 | help |
| 418 | Select this option to support Texas Instruments' on-chip Adaptive Body | 418 | Select this option to support Texas Instruments' on-chip Adaptive Body |
| @@ -522,7 +522,7 @@ config REGULATOR_TPS80031 | |||
| 522 | output to control regulators. | 522 | output to control regulators. |
| 523 | 523 | ||
| 524 | config REGULATOR_TWL4030 | 524 | config REGULATOR_TWL4030 |
| 525 | bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC" | 525 | tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC" |
| 526 | depends on TWL4030_CORE | 526 | depends on TWL4030_CORE |
| 527 | help | 527 | help |
| 528 | This driver supports the voltage regulators provided by | 528 | This driver supports the voltage regulators provided by |