diff options
| author | Mark Brown <broonie@kernel.org> | 2016-06-29 18:28:16 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-29 18:28:16 +0200 |
| commit | 10d832d607c621c101922442f4771737296e1241 (patch) | |
| tree | 421229d6bb43c301bbf5eb97b11c5901aae66e08 /drivers/regulator/Kconfig | |
| parent | Linux 4.7-rc1 (diff) | |
| parent | mfd: rn5t618: Register restart handler (diff) | |
| download | linux-10d832d607c621c101922442f4771737296e1241.tar.xz linux-10d832d607c621c101922442f4771737296e1241.zip | |
Merge tag 'ib-mfd-regulator-arm-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-rn5t618
Immutable branch between MFD, Regulator and ARM, due for v4.8
Diffstat (limited to 'drivers/regulator/Kconfig')
| -rw-r--r-- | drivers/regulator/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 144cbf5b3e5a..547269416950 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -636,10 +636,11 @@ config REGULATOR_RK808 outputs which can be controlled by i2c communication. config REGULATOR_RN5T618 - tristate "Ricoh RN5T618 voltage regulators" + tristate "Ricoh RN5T567/618 voltage regulators" depends on MFD_RN5T618 help - Say y here to support the regulators found on Ricoh RN5T618 PMIC. + Say y here to support the regulators found on Ricoh RN5T567 or + RN5T618 PMIC. config REGULATOR_RT5033 tristate "Richtek RT5033 Regulators" |