Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers

Conflicts:
	drivers/regulator/Kconfig

diff --cc drivers/regulator/Kconfig
index 0e59754d8df29ed51a841fafcf63c35c746805e0,b0ff94a6e45d9eaa7c75fdd537a03b595ca64f67..c3ca05cb5c871971629cf18315114c67406450c6
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -449,18 -449,13 +449,25 @@@ config REGULATOR_PFUZE10
          Say y here to support the regulators found on the Freescale
          PFUZE100/PFUZE200 PMIC.
  
+ config REGULATOR_PWM
+       tristate "PWM voltage regulator"
+       depends on PWM
+       help
+         This driver supports PWM controlled voltage regulators. PWM
+         duty cycle can increase or decrease the voltage.
+ 
 +config REGULATOR_QCOM_RPM
 +      tristate "Qualcomm RPM regulator driver"
 +      depends on MFD_QCOM_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
 +        8660, 8960 and 8064 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_rpm-regulator".
 +
  config REGULATOR_RC5T583
        tristate "RICOH RC5T583 Power regulators"
        depends on MFD_RC5T583

diff --cc drivers/regulator/Makefile
index 9c50dc61d92754be22e4ae936b7d77dd493a0ba5,516c36b67c590edda4df8f51e68b139d062f4d80..2f49356e03a72e808b3b49d4e4efef914ec9c65a
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -55,9 -55,9 +55,10 @@@ obj-$(CONFIG_REGULATOR_MAX77693) += max
  obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
  obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
  obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 +obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
  obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
  obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
+ obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o
  obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
  obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o
  obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o