Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / regulator / Makefile

diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 61b30c6ddecc1cf86b43b694a9939300ddbf941c..bac133afc061473f8cd74662fe9a7af091bba239 100644 (file)
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o
 
 obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
+obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o
 obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
 obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
 obj-$(CONFIG_REGULATOR_DA903X) += da903x.o