regulator: qcom: smd: remove duplicate Makefile and Kconfig entries for REGULATOR_QCO...

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 27bdc33bfb2d7421654519d2cabdc8853713c09d..00676208080e6b63afcea9b58d2dedb5d6356b55 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -547,18 +547,6 @@ config REGULATOR_QCOM_SPMI
          Qualcomm SPMI PMICs as a module. The module will be named
          "qcom_spmi-regulator".
 
-config REGULATOR_QCOM_SMD_RPM
-       tristate "Qualcomm SMD based RPM regulator driver"
-       depends on MFD_QCOM_SMD_RPM
-       help
-         If you say yes to this option, support will be included for the
-         regulators exposed by the Resource Power Manager found in Qualcomm
-         8974 based devices.
-
-         Say M here if you want to include support for the regulators on the
-         Qualcomm RPM as a module. The module will be named
-         "qcom_smd-regulator".
-
 config REGULATOR_RC5T583
        tristate "RICOH RC5T583 Power regulators"
        depends on MFD_RC5T583

diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index be39fe4b5cdc1d685f1659b6ceb5a53a78814532..fc8253d0799b4071ff9feb1d5eff917a21fbc1d5 100644 (file)
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -62,7 +62,6 @@ obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 obj-$(CONFIG_REGULATOR_MT6311) += mt6311-regulator.o
 obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
 obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
-obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
 obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
 obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
 obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o