Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index d82019c0ada5c7256a063f9afde9aa2c1418f686..ffd8d0d1909dc9b5559b4e31d329d18834ebdfbe 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -18,13 +18,9 @@ obj-$(CONFIG_SENSORS_PCA9539)        += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)  += pcf8574.o
 obj-$(CONFIG_PCF8575)          += pcf8575.o
 obj-$(CONFIG_SENSORS_PCF8591)  += pcf8591.o
-obj-$(CONFIG_ISP1301_OMAP)     += isp1301_omap.o
-obj-$(CONFIG_TPS65010)         += tps65010.o
-obj-$(CONFIG_SENSORS_TLV320AIC23) += tlv320aic23.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o
-obj-$(CONFIG_TWL4030_USB)      += twl4030-usb.o
 obj-$(CONFIG_TWL4030_POWEROFF) += twl4030-poweroff.o
 obj-$(CONFIG_TWL4030_PWRBUTTON)        += twl4030-pwrbutton.o
 obj-$(CONFIG_TWL4030_MADC)     += twl4030-madc.o