diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 07:42:55 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 07:42:55 +0400 |
commit | 1f9cc5f7716d664bfe32289ca61327be01a0a8e3 (patch) | |
tree | 06b29c20a1d0c195fbf5513fdfb860cb38f09420 /drivers/regulator/Makefile | |
parent | 207f30894a8469849d9f5663149d966ff4d411e8 (diff) | |
parent | 8dc995f56ef7aedb41873fdeaa1971f3aa166ebd (diff) | |
download | linux-1f9cc5f7716d664bfe32289ca61327be01a0a8e3.tar.xz |
Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
Diffstat (limited to 'drivers/regulator/Makefile')
-rw-r--r-- | drivers/regulator/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 993151d6fdf9..73bfb873d4b8 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -43,6 +43,7 @@ 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_PALMAS) += palmas-regulator.o +obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o @@ -58,7 +59,9 @@ obj-$(CONFIG_REGULATOR_TPS6524X) += tps6524x-regulator.o obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o +obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o +obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o |