Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[cascardo/linux.git] / drivers / thermal / Makefile

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 8ef1232..31108a0 100644 (file)
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -2,4 +2,4 @@
 # Makefile for sensor chip drivers.
 #
 
-obj-$(CONFIG_THERMAL)          += thermal.o
+obj-$(CONFIG_THERMAL)          += thermal_sys.o