From 85ec7de031fa582b5377e155c80b55b391803419 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Tue, 15 Nov 2011 14:48:00 +0800 Subject: [PATCH] --- yaml --- r: 296023 b: refs/heads/master c: 8f33eed0844d41f2cc3e0d38f866041590c0fbe1 h: refs/heads/master i: 296021: 6ebc74b0328f2eb1329fe03d62c6582121b99142 296019: 3d417ff51fb27cc74d04c227c24e6a9bbd410c69 296015: 1be17a00a3c3da038830840a929c18a317860c99 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/epit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index be5d364dda15..cfcbb38dc2de 100644 --- 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 index d3467f818c33..9129c9e7d532 100644 --- 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;