---

yaml --- r: 321518 b: refs/heads/master c: 8bb8148 h: refs/heads/master v: v3
git-mirror · Aug 6, 2012 · 1ec7451 · 1ec7451
1 parent 2f8161a
commit 1ec7451
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b984fbe0f21711975f80667f7e8b240e7848fd7
+refs/heads/master: 8bb8148c78317e9360a21a0e69a58be6862adb07
diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c
@@ -456,7 +456,7 @@ static void __init ap_init_timer(void)
 
 	clk = clk_get_sys("ap_timer", NULL);
 	BUG_ON(IS_ERR(clk));
-	clk_enable(clk);
+	clk_prepare_enable(clk);
 	rate = clk_get_rate(clk);
 
 	writel(0, TIMER0_VA_BASE + TIMER_CTRL);