From d0cfb1df41dde0eadac330831caf3d3976b2d48c Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:20:49 +0000 Subject: [PATCH] --- yaml --- r: 225826 b: refs/heads/master c: 8492fd28987732e42f33a3711299927e8905d448 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-nomadik/timer.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cd04f4ab29ad..b85bfa6cd3c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6 +refs/heads/master: 8492fd28987732e42f33a3711299927e8905d448 diff --git a/trunk/arch/arm/plat-nomadik/timer.c b/trunk/arch/arm/plat-nomadik/timer.c index 63cdc6025bd7..b0bd6dfea52b 100644 --- a/trunk/arch/arm/plat-nomadik/timer.c +++ b/trunk/arch/arm/plat-nomadik/timer.c @@ -222,7 +222,6 @@ void __init nmdk_timer_init(void) } else { cr |= MTU_CRn_PRESCALE_1; } - clocksource_calc_mult_shift(&nmdk_clksrc, rate, MTU_MIN_RANGE); /* Timer 0 is the free running clocksource */ writel(cr, mtu_base + MTU_CR(0)); @@ -233,7 +232,7 @@ void __init nmdk_timer_init(void) /* Now the clock source is ready */ nmdk_clksrc.read = nmdk_read_timer; - if (clocksource_register(&nmdk_clksrc)) + if (clocksource_register_hz(&nmdk_clksrc, rate)) pr_err("timer: failed to initialize clock source %s\n", nmdk_clksrc.name);