From 7389aca512d409da71c9553d7849f95f6a247fd8 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 19 Oct 2010 17:58:48 -0700 Subject: [PATCH] --- yaml --- r: 277426 b: refs/heads/master c: 027f6ad7bfa97cf8f75e9d81c15256d828eb0809 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v32/kernel/time.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3e4a502c0ee..b9a8ba9bafe5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a139723bec122053a94c80596c8b991b860ffb91 +refs/heads/master: 027f6ad7bfa97cf8f75e9d81c15256d828eb0809 diff --git a/trunk/arch/cris/arch-v32/kernel/time.c b/trunk/arch/cris/arch-v32/kernel/time.c index bb978ede8985..6773fc83a670 100644 --- a/trunk/arch/cris/arch-v32/kernel/time.c +++ b/trunk/arch/cris/arch-v32/kernel/time.c @@ -47,14 +47,12 @@ static struct clocksource cont_rotime = { .rating = 300, .read = read_cont_rotime, .mask = CLOCKSOURCE_MASK(32), - .shift = 10, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static int __init etrax_init_cont_rotime(void) { - cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift); - clocksource_register(&cont_rotime); + clocksource_register_khz(&cont_rotime, 100000); return 0; } arch_initcall(etrax_init_cont_rotime);