From c6a06bee3d17eed3a657aeb78bf2f0f5b0dfb286 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:20:06 +0000 Subject: [PATCH] --- yaml --- r: 225823 b: refs/heads/master c: 894cf56b1a64b65360086c2c890c2ae7f257793f h: refs/heads/master i: 225821: 5c5c05a5b5666ade1f20ab2f63a3a783c2d8d67f 225819: 02712a4deecbae06c73137a09677249bd5233821 225815: 6f3062328950ee2d58332bf3a2b07e7c29ccf005 225807: dac4ebacfc139cf697c30d7edfb571e4d2beb168 225791: 1cb66b2a38fb3c96d67d276ac5a69e5ef3a65dbb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-w90x900/time.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fd42d8a6998b..f02f265760d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da797478c1ba05a858c7719a02ce0856a5bb69ce +refs/heads/master: 894cf56b1a64b65360086c2c890c2ae7f257793f diff --git a/trunk/arch/arm/mach-w90x900/time.c b/trunk/arch/arm/mach-w90x900/time.c index b80f769bc135..4b089cb930dc 100644 --- a/trunk/arch/arm/mach-w90x900/time.c +++ b/trunk/arch/arm/mach-w90x900/time.c @@ -153,7 +153,6 @@ static struct clocksource clocksource_nuc900 = { .rating = 200, .read = nuc900_get_cycles, .mask = CLOCKSOURCE_MASK(TDR_SHIFT), - .shift = 10, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -176,9 +175,7 @@ static void __init nuc900_clocksource_init(void) val |= (COUNTEN | PERIOD | PRESCALE); __raw_writel(val, REG_TCSR1); - clocksource_nuc900.mult = - clocksource_khz2mult((rate / 1000), clocksource_nuc900.shift); - clocksource_register(&clocksource_nuc900); + clocksource_register_hz(&clocksource_nuc900, rate); } static void __init nuc900_timer_init(void)