Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / drivers / mfd / Makefile

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index eb42bd4..8116c19 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -41,24 +41,24 @@ obj-$(CONFIG_MFD_TQMX86)    += tqmx86.o
 
 obj-$(CONFIG_MFD_LOCHNAGAR)    += lochnagar-i2c.o
 
-obj-$(CONFIG_MFD_ARIZONA)      += arizona-core.o
-obj-$(CONFIG_MFD_ARIZONA)      += arizona-irq.o
+arizona-objs                   := arizona-core.o arizona-irq.o
+obj-$(CONFIG_MFD_ARIZONA)      += arizona.o
 obj-$(CONFIG_MFD_ARIZONA_I2C)  += arizona-i2c.o
 obj-$(CONFIG_MFD_ARIZONA_SPI)  += arizona-spi.o
 ifeq ($(CONFIG_MFD_WM5102),y)
-obj-$(CONFIG_MFD_ARIZONA)      += wm5102-tables.o
+arizona-objs                   += wm5102-tables.o
 endif
 ifeq ($(CONFIG_MFD_WM5110),y)
-obj-$(CONFIG_MFD_ARIZONA)      += wm5110-tables.o
+arizona-objs                   += wm5110-tables.o
 endif
 ifeq ($(CONFIG_MFD_WM8997),y)
-obj-$(CONFIG_MFD_ARIZONA)      += wm8997-tables.o
+arizona-objs                   += wm8997-tables.o
 endif
 ifeq ($(CONFIG_MFD_WM8998),y)
-obj-$(CONFIG_MFD_ARIZONA)      += wm8998-tables.o
+arizona-objs                   += wm8998-tables.o
 endif
 ifeq ($(CONFIG_MFD_CS47L24),y)
-obj-$(CONFIG_MFD_ARIZONA)      += cs47l24-tables.o
+arizona-objs                   += cs47l24-tables.o
 endif
 obj-$(CONFIG_MFD_WCD934X)      += wcd934x.o
 obj-$(CONFIG_MFD_WM8400)       += wm8400-core.o
@@ -105,7 +105,6 @@ obj-$(CONFIG_MFD_TPS65910)  += tps65910.o
 obj-$(CONFIG_MFD_TPS65912)     += tps65912-core.o
 obj-$(CONFIG_MFD_TPS65912_I2C) += tps65912-i2c.o
 obj-$(CONFIG_MFD_TPS65912_SPI)  += tps65912-spi.o
-obj-$(CONFIG_MFD_TPS68470)     += tps68470.o
 obj-$(CONFIG_MFD_TPS80031)     += tps80031.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
 
@@ -265,6 +264,7 @@ obj-$(CONFIG_MFD_ROHM_BD957XMUF)    += rohm-bd9576.o
 obj-$(CONFIG_MFD_STMFX)        += stmfx.o
 obj-$(CONFIG_MFD_KHADAS_MCU)   += khadas-mcu.o
 obj-$(CONFIG_MFD_ACER_A500_EC) += acer-ec-a500.o
+obj-$(CONFIG_MFD_QCOM_PM8008)  += qcom-pm8008.o
 
 obj-$(CONFIG_SGI_MFD_IOC3)     += ioc3.o
 obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)       += simple-mfd-i2c.o