diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-30 12:14:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-30 12:14:02 -0400 |
| commit | 2ed89d577c172506b5bada8c5810f607a4eae771 (patch) | |
| tree | 74aa8eb77a90b51644474556c9c7ee697d965637 /drivers/regulator | |
| parent | 2dfcb921da781f8b1a166d0ff3a36b3e6804cdf1 (diff) | |
| parent | 3b063496f0dc8eb5bf9c73ee72f9fb42157581ff (diff) | |
Merge remote-tracking branch 'regulator/topic/tps80031' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 527bd6a51ef8..4c2631a2bb3c 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig | |||
| @@ -828,7 +828,7 @@ config REGULATOR_TPS65912 | |||
| 828 | This driver supports TPS65912 voltage regulator chip. | 828 | This driver supports TPS65912 voltage regulator chip. |
| 829 | 829 | ||
| 830 | config REGULATOR_TPS80031 | 830 | config REGULATOR_TPS80031 |
| 831 | tristate "TI TPS80031/TPS80032 power regualtor driver" | 831 | tristate "TI TPS80031/TPS80032 power regulator driver" |
| 832 | depends on MFD_TPS80031 | 832 | depends on MFD_TPS80031 |
| 833 | help | 833 | help |
| 834 | TPS80031/ TPS80032 Fully Integrated Power Management with Power | 834 | TPS80031/ TPS80032 Fully Integrated Power Management with Power |