Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / drivers / i2c / chips / Makefile

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 1f81ebd..ba41a57 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -10,6 +10,7 @@
 #
 
 obj-$(CONFIG_DS1682)           += ds1682.o
+obj-$(CONFIG_AT24)             += at24.o
 obj-$(CONFIG_SENSORS_EEPROM)   += eeprom.o
 obj-$(CONFIG_SENSORS_MAX6875)  += max6875.o
 obj-$(CONFIG_SENSORS_PCA9539)  += pca9539.o
@@ -23,8 +24,7 @@ obj-$(CONFIG_GPIOEXPANDER_OMAP)       += gpio_expander_omap.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 obj-$(CONFIG_SENSORS_TSL2563)  += tsl2563.o
-obj-$(CONFIG_TWL4030_CORE)     += twl4030-core.o twl4030-pwrirq.o
-obj-$(CONFIG_TWL4030_GPIO)     += twl4030-gpio.o
+obj-$(CONFIG_TWL4030_CORE)     += twl4030-pwrirq.o twl4030-power.o
 obj-$(CONFIG_TWL4030_USB)      += twl4030-usb.o
 obj-$(CONFIG_TWL4030_POWEROFF) += twl4030-poweroff.o
 obj-$(CONFIG_TWL4030_PWRBUTTON)        += twl4030-pwrbutton.o