diff --git a/[refs] b/[refs]
index adc01eb37410..393a05f95580 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8a8f847cc3762f07851e377c7b9515634372bb2
+refs/heads/master: 687ad31ca3debfbc6803a323018f3bfc00a03b98
diff --git a/trunk/drivers/staging/omap-thermal/Makefile b/trunk/drivers/staging/omap-thermal/Makefile
index 091c4d20b14d..fbd14d1365db 100644
--- a/trunk/drivers/staging/omap-thermal/Makefile
+++ b/trunk/drivers/staging/omap-thermal/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_OMAP_BANDGAP)	+= omap-thermal.o
 omap-thermal-y			:= omap-bandgap.o
 omap-thermal-$(CONFIG_OMAP_THERMAL)	+= omap-thermal-common.o
-omap-thermal-$(CONFIG_OMAP4_THERMAL)	+= omap4-thermal.o
-omap-thermal-$(CONFIG_OMAP5_THERMAL)	+= omap5-thermal.o
+omap-thermal-$(CONFIG_OMAP4_THERMAL)	+= omap4-thermal-data.o
+omap-thermal-$(CONFIG_OMAP5_THERMAL)	+= omap5-thermal-data.o
diff --git a/trunk/drivers/staging/omap-thermal/omap4-thermal.c b/trunk/drivers/staging/omap-thermal/omap4-thermal-data.c
similarity index 100%
rename from trunk/drivers/staging/omap-thermal/omap4-thermal.c
rename to trunk/drivers/staging/omap-thermal/omap4-thermal-data.c
diff --git a/trunk/drivers/staging/omap-thermal/omap5-thermal.c b/trunk/drivers/staging/omap-thermal/omap5-thermal-data.c
similarity index 100%
rename from trunk/drivers/staging/omap-thermal/omap5-thermal.c
rename to trunk/drivers/staging/omap-thermal/omap5-thermal-data.c