summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 14:50:18 +0200
committerMark Brown <broonie@linaro.org>2013-09-01 14:50:18 +0200
commit09f2dd88ff93a6d31e10dd5c25e2aa2a8b7b12ee (patch)
tree65c4be47e2411c67e3071e08d67cad3b834ee88c /drivers/regulator/Makefile
parentMerge remote-tracking branch 'regulator/topic/palmas' into regulator-next (diff)
parentregulator: pfuze100: Fix off-by-one for max_register setting (diff)
downloadlinux-09f2dd88ff93a6d31e10dd5c25e2aa2a8b7b12ee.tar.xz
linux-09f2dd88ff93a6d31e10dd5c25e2aa2a8b7b12ee.zip
Merge remote-tracking branch 'regulator/topic/pfuze100' into regulator-next
Diffstat (limited to 'drivers/regulator/Makefile')
-rw-r--r--drivers/regulator/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 90c31e74ca28..185cce246022 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -49,6 +49,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_PFUZE100) += pfuze100-regulator.o
obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o