Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index b5e6d2f..a876dd4 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -1,52 +1,16 @@
 #
-# Makefile for sensor and "other" I2C chip drivers.
+# Makefile for miscellaneous I2C chip drivers.
 #
 
-# asb100, then w83781d go first, as they can override other drivers' addresses.
-obj-$(CONFIG_SENSORS_ASB100)   += asb100.o
-obj-$(CONFIG_SENSORS_W83627HF) += w83627hf.o
-obj-$(CONFIG_SENSORS_W83781D)  += w83781d.o
-
-obj-$(CONFIG_SENSORS_ADM1021)  += adm1021.o
-obj-$(CONFIG_SENSORS_ADM1025)  += adm1025.o
-obj-$(CONFIG_SENSORS_ADM1026)  += adm1026.o
-obj-$(CONFIG_SENSORS_ADM1031)  += adm1031.o
-obj-$(CONFIG_SENSORS_ADM9240)  += adm9240.o
-obj-$(CONFIG_SENSORS_ATXP1)    += atxp1.o
 obj-$(CONFIG_SENSORS_DS1337)   += ds1337.o
 obj-$(CONFIG_SENSORS_DS1374)   += ds1374.o
-obj-$(CONFIG_SENSORS_DS1621)   += ds1621.o
 obj-$(CONFIG_SENSORS_EEPROM)   += eeprom.o
-obj-$(CONFIG_SENSORS_FSCHER)   += fscher.o
-obj-$(CONFIG_SENSORS_FSCPOS)   += fscpos.o
-obj-$(CONFIG_SENSORS_GL518SM)  += gl518sm.o
-obj-$(CONFIG_SENSORS_GL520SM)  += gl520sm.o
-obj-$(CONFIG_SENSORS_IT87)     += it87.o
-obj-$(CONFIG_SENSORS_LM63)     += lm63.o
-obj-$(CONFIG_SENSORS_LM75)     += lm75.o
-obj-$(CONFIG_SENSORS_LM77)     += lm77.o
-obj-$(CONFIG_SENSORS_LM78)     += lm78.o
-obj-$(CONFIG_SENSORS_LM80)     += lm80.o
-obj-$(CONFIG_SENSORS_LM83)     += lm83.o
-obj-$(CONFIG_SENSORS_LM85)     += lm85.o
-obj-$(CONFIG_SENSORS_LM87)     += lm87.o
-obj-$(CONFIG_SENSORS_LM90)     += lm90.o
-obj-$(CONFIG_SENSORS_LM92)     += lm92.o
-obj-$(CONFIG_SENSORS_MAX1619)  += max1619.o
 obj-$(CONFIG_SENSORS_MAX6875)  += max6875.o
 obj-$(CONFIG_SENSORS_M41T00)   += m41t00.o
-obj-$(CONFIG_SENSORS_PC87360)  += pc87360.o
 obj-$(CONFIG_SENSORS_PCA9539)  += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)  += pcf8574.o
 obj-$(CONFIG_SENSORS_PCF8591)  += pcf8591.o
 obj-$(CONFIG_SENSORS_RTC8564)  += rtc8564.o
-obj-$(CONFIG_SENSORS_SIS5595)  += sis5595.o
-obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
-obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
-obj-$(CONFIG_SENSORS_VIA686A)  += via686a.o
-obj-$(CONFIG_SENSORS_W83627EHF)        += w83627ehf.o
-obj-$(CONFIG_SENSORS_W83L785TS)        += w83l785ts.o
-
 obj-$(CONFIG_ISP1301_OMAP)     += isp1301_omap.o
 obj-$(CONFIG_TPS65010)         += tps65010.o