diff --git a/[refs] b/[refs]
index 4f19f0f56c66..92b497bc35d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 841d481b3c65b455d88112180c667c21a7c9c9f2
+refs/heads/master: 5fc024ab474de7d5798b7ad85f3df260dbab1353
diff --git a/trunk/drivers/thermal/Makefile b/trunk/drivers/thermal/Makefile
index 7f6509a97c14..1bf2eab50b27 100644
--- a/trunk/drivers/thermal/Makefile
+++ b/trunk/drivers/thermal/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_THERMAL)		+= thermal_sys.o
+thermal_sys-y			+= thermal_core.o
 
 # governors
 obj-$(CONFIG_THERMAL_GOV_FAIR_SHARE)	+= fair_share.o
diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_core.c
similarity index 100%
rename from trunk/drivers/thermal/thermal_sys.c
rename to trunk/drivers/thermal/thermal_core.c