---

yaml --- r: 363359 b: refs/heads/master c: 687ad31 h: refs/heads/master i: 363357: ea00d5e 363355: 66db5f2 363351: 09f015c 363343: 5613296 363327: 1b8cc56 v: v3
git-mirror · Mar 11, 2013 · 5d98929 · 5d98929
1 parent a02174d
commit 5d98929
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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/...vers/staging/omap-thermal/omap4-thermal.c → ...staging/omap-thermal/omap4-thermal-data.c b/...vers/staging/omap-thermal/omap4-thermal.c → ...staging/omap-thermal/omap4-thermal-data.c
diff --git a/...vers/staging/omap-thermal/omap5-thermal.c → ...staging/omap-thermal/omap5-thermal-data.c b/...vers/staging/omap-thermal/omap5-thermal.c → ...staging/omap-thermal/omap5-thermal-data.c