---

yaml --- r: 192087 b: refs/heads/master c: 8ca2e59 h: refs/heads/master i: 192085: 784097e 192083: d49ecb8 192079: c059889 v: v3
git-mirror · May 6, 2010 · 17ddd2e · 17ddd2e
1 parent f9e9fe5
commit 17ddd2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 */