diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-04-24 13:06:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-04-24 13:06:25 -0700 |
| commit | f64399836125c8512f8a3fe72c1719795a9c5812 (patch) | |
| tree | 0c024bf9d45eae5160b7a2ad875c40596b36b0e2 | |
| parent | 6e2d43100c906c6f3d68c45fd2a08ea4be92285c (diff) | |
| parent | 2af72ec297d1d4928d0522b45c8ee87cb0d5f5ff (diff) | |
| download | linux-next-f64399836125c8512f8a3fe72c1719795a9c5812.tar.gz linux-next-f64399836125c8512f8a3fe72c1719795a9c5812.zip | |
Merge tag 'regulator-fix-v7.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown:
"Just one trivial cleanup of the user visible prompts in Kconfig here,
standardising how we describe Qualcomm"
* tag 'regulator-fix-v7.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: qcom: Unify user-visible "Qualcomm" name
| -rw-r--r-- | drivers/regulator/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 10e64e3ffb1f..e8002526cfb0 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1173,7 +1173,7 @@ config REGULATOR_QCOM_RPM "qcom_rpm-regulator". config REGULATOR_QCOM_RPMH - tristate "Qualcomm Technologies, Inc. RPMh regulator driver" + tristate "Qualcomm RPMh regulator driver" depends on QCOM_RPMH || (QCOM_RPMH=n && COMPILE_TEST) depends on QCOM_COMMAND_DB || (QCOM_COMMAND_DB=n && COMPILE_TEST) help @@ -1877,7 +1877,7 @@ config REGULATOR_WM8994 WM8994 CODEC. config REGULATOR_QCOM_LABIBB - tristate "QCOM LAB/IBB regulator support" + tristate "Qualcomm LAB/IBB regulator support" depends on SPMI || COMPILE_TEST help This driver supports Qualcomm's LAB/IBB regulators present on the |