From 02712a4deecbae06c73137a09677249bd5233821 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:19:22 +0000 Subject: [PATCH] --- yaml --- r: 225819 b: refs/heads/master c: 71c874529904818a2888a650425369e0842ff28d h: refs/heads/master i: 225817: c4a99aa7fb108ac882a06bf3c1b86e45e95e0b7b 225815: 6f3062328950ee2d58332bf3a2b07e7c29ccf005 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pv310/time.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bd2df9342845..f4f5beb13899 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f62ae0ce4369effc432ea25df09c88d7aa08965e +refs/heads/master: 71c874529904818a2888a650425369e0842ff28d diff --git a/trunk/arch/arm/mach-s5pv310/time.c b/trunk/arch/arm/mach-s5pv310/time.c index 01b012ad1bfd..b262d4615331 100644 --- a/trunk/arch/arm/mach-s5pv310/time.c +++ b/trunk/arch/arm/mach-s5pv310/time.c @@ -211,7 +211,6 @@ struct clocksource pwm_clocksource = { .rating = 250, .read = s5pv310_pwm4_read, .mask = CLOCKSOURCE_MASK(32), - .shift = 20, .flags = CLOCK_SOURCE_IS_CONTINUOUS , }; @@ -230,10 +229,7 @@ static void __init s5pv310_clocksource_init(void) s5pv310_pwm_init(4, ~0); s5pv310_pwm_start(4, 1); - pwm_clocksource.mult = - clocksource_khz2mult(clock_rate/1000, pwm_clocksource.shift); - - if (clocksource_register(&pwm_clocksource)) + if (clocksource_register_hz(&pwm_clocksource, clock_rate)) panic("%s: can't register clocksource\n", pwm_clocksource.name); }