diff options
author | Mark Brown <broonie@kernel.org> | 2021-01-04 18:09:23 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-01-04 18:09:23 +0100 |
commit | c42088491c12f888e9e31ad37c019cb7c310065c (patch) | |
tree | be47a024ab4425f4fd003e17932c4a0695e4110c | |
parent | Merge series "regulator: fix pm8009 bindings on sm8250" from Dmitry Baryshkov... (diff) | |
parent | Merge qcom driver fix into regulator-5.11 (diff) | |
download | linux-c42088491c12f888e9e31ad37c019cb7c310065c.tar.xz linux-c42088491c12f888e9e31ad37c019cb7c310065c.zip |
Merge branch 'regulator-5.11' into regulator-5.12
-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 a7fbb9a87413..b1d2103bfe57 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -889,7 +889,7 @@ config REGULATOR_QCOM_RPM config REGULATOR_QCOM_RPMH tristate "Qualcomm Technologies, Inc. RPMh regulator driver" depends on QCOM_RPMH || (QCOM_RPMH=n && COMPILE_TEST) - depends on QCOM_COMMAND_DB || !QCOM_COMMAND_DB + depends on QCOM_COMMAND_DB || (QCOM_COMMAND_DB=n && COMPILE_TEST) help This driver supports control of PMIC regulators via the RPMh hardware block found on Qualcomm Technologies Inc. SoCs. RPMh regulator |