Merge branch 'clksrc' into devel

[cascardo/linux.git] / arch / arm / common / timer-sp.c

diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index 4740313..6ef3342 100644 (file)
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -44,7 +44,6 @@ static struct clocksource clocksource_sp804 = {
        .rating         = 200,
        .read           = sp804_read,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -61,8 +60,7 @@ void __init sp804_clocksource_init(void __iomem *base)
        writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
                clksrc_base + TIMER_CTRL);
 
-       cs->mult = clocksource_khz2mult(TIMER_FREQ_KHZ, cs->shift);
-       clocksource_register(cs);
+       clocksource_register_khz(cs, TIMER_FREQ_KHZ);
 }