Merge remote-tracking branch 'regulator/topic/helpers' into regulator…

…-next
git-mirror · Sep 1, 2013 · 724d054 · 724d054
2 parents 446b466 + d295f76
commit 724d054
Show file tree

Hide file tree

Showing 4 changed files with 458 additions and 463 deletions.
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
@@ -3,7 +3,7 @@
 #
 
 
-obj-$(CONFIG_REGULATOR) += core.o dummy.o fixed-helper.o
+obj-$(CONFIG_REGULATOR) += core.o dummy.o fixed-helper.o helpers.o
 obj-$(CONFIG_OF) += of_regulator.o
 obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o