diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-28 13:14:26 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-28 13:14:26 +0200 |
| commit | d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3 (patch) | |
| tree | 30f11b3581cdab9f344bd6718a73988e7fc6a59c /drivers/regulator/Makefile | |
| parent | regulator: qcom_rpm: Fix FORCE_MODE_IS_2_BITS macro (diff) | |
| parent | regulator: pwm-regulator: add devicetree bindings for pwm regulator (diff) | |
| download | linux-d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3.tar.xz linux-d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3.zip | |
Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers
Conflicts:
drivers/regulator/Kconfig
Diffstat (limited to 'drivers/regulator/Makefile')
| -rw-r--r-- | drivers/regulator/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 9c50dc61d927..2f49356e03a7 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -58,6 +58,7 @@ 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 @@ -66,7 +67,6 @@ 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 |