Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 45b7389d77aa..7c0774397b89 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -198,8 +198,6 @@ static struct clocksource clocksource_cr16 = {
         .rating                 = 300,
         .read                   = read_cr16,
         .mask                   = CLOCKSOURCE_MASK(BITS_PER_LONG),
-        .mult                   = 0, /* to be set */
-        .shift                  = 22,
         .flags                  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -270,7 +268,5 @@ void __init time_init(void)
 
         /* register at clocksource framework */
         current_cr16_khz = PAGE0->mem_10msec/10;  /* kHz */
-        clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz,
-                                                clocksource_cr16.shift);
-        clocksource_register(&clocksource_cr16);
+        clocksource_register_khz(&clocksource_cr16, current_cr16_khz);
 }