From: Mark Brown <broonie@linaro.org>
Date: Wed, 26 Mar 2014 16:58:18 +0000 (+0000)
Subject: Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=24ee65e4a50fcefa2a7197f45a330ee96ec84a4b;p=deliverable%2Flinux.git

Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm', 'regulator/topic/ti-abb', 'regulator/topic/tps51632', 'regulator/topic/tps62360', 'regulator/topic/tps6507x', 'regulator/topic/tps65090' and 'regulator/topic/tps65217' into regulator-next
---

24ee65e4a50fcefa2a7197f45a330ee96ec84a4b
diff --cc drivers/regulator/Makefile
index c3416728c14d,979f9ddcf259,d0c2bb85b8cb,979f9ddcf259,979f9ddcf259,979f9ddcf259,979f9ddcf259,979f9ddcf259,979f9ddcf259..0cfca37941ec
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@@@@ -58,9 -57,8 -57,9 -57,8 -57,8 -57,8 -57,8 -57,8 -57,8 +58,10 @@@@@@@@@@ obj-$(CONFIG_REGULATOR_TPS51632) += tps
         obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
         obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
         obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
 ++++++++obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
         obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
         obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
++ ++++++obj-$(CONFIG_REGULATOR_ST_PWM) += st-pwm.o
         obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
         obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
         obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o