commit 66ee69234795c0596f84b25f06b7fbc2e8ed214c
author Simon Glass <sjg@chromium.org> Thu Dec 13 20:48:34 2012 +0000
committer Tom Rini <trini@ti.com> Fri Feb 01 15:07:50 2013 -0500
tree e67321700886c597591624f825379a2d76dbd99c
parent 8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d

arm: Move tbl to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>

arch/arm/cpu/arm926ejs/davinci/timer.c

diff --git a/arch/arm/cpu/arm926ejs/davinci/timer.c b/arch/arm/cpu/arm926ejs/davinci/timer.c
index e28e6e3..b620bf7 100644
--- a/arch/arm/cpu/arm926ejs/davinci/timer.c
+++ b/arch/arm/cpu/arm926ejs/davinci/timer.c
@@ -74,11 +74,11 @@
 	unsigned long now = readl(&timer->tim34);
 
 	/* increment tbu if tbl has rolled over */
-	if (now < gd->tbl)
+	if (now < gd->arch.tbl)
 		gd->arch.tbu++;
-	gd->tbl = now;
+	gd->arch.tbl = now;
 
-	return (((unsigned long long)gd->arch.tbu) << 32) | gd->tbl;
+	return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;
 }
 
 ulong get_timer(ulong base)