---

yaml --- r: 296023 b: refs/heads/master c: 8f33eed h: refs/heads/master i: 296021: 6ebc74b 296019: 3d417ff 296015: 1be17a0 v: v3
git-mirror · Feb 1, 2012 · 85ec7de · 85ec7de
1 parent f7ced24
commit 85ec7de
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: c23c081a471b81e53707512d3aec553aaad52cc4
+refs/heads/master: 8f33eed0844d41f2cc3e0d38f866041590c0fbe1
diff --git a/trunk/arch/arm/plat-mxc/epit.c b/trunk/arch/arm/plat-mxc/epit.c
@@ -203,7 +203,7 @@ static int __init epit_clockevent_init(struct clk *timer_clk)
 
 void __init epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq)
 {
-	clk_enable(timer_clk);
+	clk_prepare_enable(timer_clk);
 
 	timer_base = base;