Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 6c1236d2a56315e709b21d56ca5d04a173261a3d..7ca14f45771025168a1199ab4a15b738f5eee0d5 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -8,6 +8,8 @@ obj-$(CONFIG_MFD_ASIC3)         += asic3.o
 obj-$(CONFIG_HTC_EGPIO)                += htc-egpio.o
 obj-$(CONFIG_HTC_PASIC3)       += htc-pasic3.o
 
+obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o
+
 obj-$(CONFIG_MFD_T7L66XB)      += t7l66xb.o
 obj-$(CONFIG_MFD_TC6387XB)     += tc6387xb.o
 obj-$(CONFIG_MFD_TC6393XB)     += tc6393xb.o
@@ -17,6 +19,9 @@ wm8350-objs                   := wm8350-core.o wm8350-regmap.o wm8350-gpio.o
 obj-$(CONFIG_MFD_WM8350)       += wm8350.o
 obj-$(CONFIG_MFD_WM8350_I2C)   += wm8350-i2c.o
 
+obj-$(CONFIG_TPS65010)         += tps65010.o
+obj-$(CONFIG_MENELAUS)         += menelaus.o
+
 obj-$(CONFIG_TWL4030_CORE)     += twl4030-core.o twl4030-irq.o
 obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o
 
@@ -32,4 +37,4 @@ obj-$(CONFIG_MCP_UCB1200)     += ucb1x00-assabet.o
 endif
 obj-$(CONFIG_UCB1400_CORE)     += ucb1400_core.o
 
-obj-$(CONFIG_PMIC_DA903X)      += da903x.o
\ No newline at end of file
+obj-$(CONFIG_PMIC_DA903X)      += da903x.o