Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 6da3eef943064a82302fda6ae75b68dc6f5f2e64..dd0528f2e1ebeef14155ae771486194634ff1b99 100644 (file)
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -67,6 +67,7 @@ obj-$(CONFIG_SENSORS_VT1211)  += vt1211.o
 obj-$(CONFIG_SENSORS_VT8231)   += vt8231.o
 obj-$(CONFIG_SENSORS_W83627EHF)        += w83627ehf.o
 obj-$(CONFIG_SENSORS_W83L785TS)        += w83l785ts.o
+obj-$(CONFIG_SENSORS_TSC210X)  += tsc210x_sensors.o
 
 ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG