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 834f546..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
 
@@ -178,8 +177,6 @@ obj-$(CONFIG_MFD_PCF50633)  += pcf50633.o
 obj-$(CONFIG_PCF50633_ADC)     += pcf50633-adc.o
 obj-$(CONFIG_PCF50633_GPIO)    += pcf50633-gpio.o
 obj-$(CONFIG_ABX500_CORE)      += abx500-core.o
-obj-$(CONFIG_AB3100_CORE)      += ab3100-core.o
-obj-$(CONFIG_AB3100_OTP)       += ab3100-otp.o
 obj-$(CONFIG_AB8500_DEBUG)     += ab8500-debugfs.o
 obj-$(CONFIG_MFD_DB8500_PRCMU) += db8500-prcmu.o
 # ab8500-core need to come after db8500-prcmu (which provides the channel)
@@ -218,6 +215,7 @@ obj-$(CONFIG_MFD_INTEL_PMC_BXT)     += intel_pmc_bxt.o
 obj-$(CONFIG_MFD_INTEL_PMT)    += intel_pmt.o
 obj-$(CONFIG_MFD_PALMAS)       += palmas.o
 obj-$(CONFIG_MFD_VIPERBOARD)    += viperboard.o
+obj-$(CONFIG_MFD_NTXEC)                += ntxec.o
 obj-$(CONFIG_MFD_RC5T583)      += rc5t583.o rc5t583-irq.o
 obj-$(CONFIG_MFD_RK808)                += rk808.o
 obj-$(CONFIG_MFD_RN5T618)      += rn5t618.o
@@ -235,6 +233,7 @@ obj-$(CONFIG_MFD_MENF21BMC) += menf21bmc.o
 obj-$(CONFIG_MFD_HI6421_PMIC)  += hi6421-pmic-core.o
 obj-$(CONFIG_MFD_HI655X_PMIC)   += hi655x-pmic.o
 obj-$(CONFIG_MFD_DLN2)         += dln2.o
+obj-$(CONFIG_MFD_RT4831)       += rt4831.o
 obj-$(CONFIG_MFD_RT5033)       += rt5033.o
 obj-$(CONFIG_MFD_SKY81452)     += sky81452.o
 
@@ -261,10 +260,15 @@ obj-$(CONFIG_RAVE_SP_CORE)        += rave-sp.o
 obj-$(CONFIG_MFD_ROHM_BD70528) += rohm-bd70528.o
 obj-$(CONFIG_MFD_ROHM_BD71828) += rohm-bd71828.o
 obj-$(CONFIG_MFD_ROHM_BD718XX) += rohm-bd718x7.o
+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
 obj-$(CONFIG_MFD_INTEL_M10_BMC)   += intel-m10-bmc.o
+
+obj-$(CONFIG_MFD_ATC260X)      += atc260x-core.o
+obj-$(CONFIG_MFD_ATC260X_I2C)  += atc260x-i2c.o