From 17ddd2e216f13fab5a3f4b9652ce9e8560ae87c1 Mon Sep 17 00:00:00 2001
From: Cyril Chemparathy <cyril@ti.com>
Date: Thu, 25 Mar 2010 17:43:45 -0400
Subject: [PATCH] --- yaml --- r: 192087 b: refs/heads/master c:
 8ca2e597fc8f3337cef1f8febab482fe8c52b004 h: refs/heads/master i:   192085:
 784097e0cbedffcf4209c5ee8fe67fb1ae861639   192083:
 d49ecb866268623e7d4ebd1af45f35693343f0e4   192079:
 c059889f95155429f27370d15097f2a956a0e2d7 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-davinci/time.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1b99b00c0f03..25c21a7bf15b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b722049d7e60356fe04bcac6065a7c8b1c64c06f
+refs/heads/master: 8ca2e597fc8f3337cef1f8febab482fe8c52b004
diff --git a/trunk/arch/arm/mach-davinci/time.c b/trunk/arch/arm/mach-davinci/time.c
index 9e0b106b4f5f..b21f7633d9a8 100644
--- a/trunk/arch/arm/mach-davinci/time.c
+++ b/trunk/arch/arm/mach-davinci/time.c
@@ -361,13 +361,13 @@ static void __init davinci_timer_init(void)
 		}
 	}
 
-	/* init timer hw */
-	timer_init();
-
 	timer_clk = clk_get(NULL, "timer0");
 	BUG_ON(IS_ERR(timer_clk));
 	clk_enable(timer_clk);
 
+	/* init timer hw */
+	timer_init();
+
 	davinci_clock_tick_rate = clk_get_rate(timer_clk);
 
 	/* setup clocksource */