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 3bdb05a5cbd7c5b86c9394d0eb1d9a9627dcd109..8e401f2f452fead464ca845de9c232cb61499953 100644 (file)
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -70,6 +70,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
 obj-$(CONFIG_SENSORS_W83L786NG)        += w83l786ng.o
 
 ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)