Commit f6439983 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v7.1-merge-window' of... 

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
parents 6e2d4310 2af72ec2

drivers/regulator/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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