From 5c5c05a5b5666ade1f20ab2f63a3a783c2d8d67f Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:19:44 +0000 Subject: [PATCH] --- yaml --- r: 225821 b: refs/heads/master c: 6b46340a18e7552656097119d121b4b42049dde1 h: refs/heads/master i: 225819: 02712a4deecbae06c73137a09677249bd5233821 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tcc8k/time.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 67a93a690f58..e3208b757609 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c760b5b52a56e8b92c384dc9611e23fd4980d03 +refs/heads/master: 6b46340a18e7552656097119d121b4b42049dde1 diff --git a/trunk/arch/arm/mach-tcc8k/time.c b/trunk/arch/arm/mach-tcc8k/time.c index 78d06008841d..e0a8d609afe1 100644 --- a/trunk/arch/arm/mach-tcc8k/time.c +++ b/trunk/arch/arm/mach-tcc8k/time.c @@ -35,7 +35,6 @@ static struct clocksource clocksource_tcc = { .rating = 200, .read = tcc_get_cycles, .mask = CLOCKSOURCE_MASK(32), - .shift = 28, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -103,9 +102,7 @@ static int __init tcc_clockevent_init(struct clk *clock) { unsigned int c = clk_get_rate(clock); - clocksource_tcc.mult = clocksource_hz2mult(c, - clocksource_tcc.shift); - clocksource_register(&clocksource_tcc); + clocksource_register_hz(&clocksource_tcc, c); clockevent_tcc.mult = div_sc(c, NSEC_PER_SEC, clockevent_tcc.shift);