Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release

[linux-2.6] / drivers / thermal / Makefile

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 8ef1232de37664b2bac7ffa5fc292ea635083969..31108a01c22e21d659aa68609cda0436f123e448 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