Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / plat-spear / time.c

diff --git a/arch/arm/plat-spear/time.c b/arch/arm/plat-spear/time.c
index ab211652e4ca79d3e814bc9967cdace8d10edf7c..839c88df99947d87ed825ba69a00323c4956cd8a 100644 (file)
--- a/arch/arm/plat-spear/time.c
+++ b/arch/arm/plat-spear/time.c
@@ -81,8 +81,6 @@ static struct clocksource clksrc = {
        .rating = 200,          /* its a pretty decent clock */
        .read = clocksource_read_cycles,
        .mask = 0xFFFF,         /* 16 bits */
-       .mult = 0,              /* to be computed */
-       .shift = 0,             /* to be computed */
        .flags = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -105,10 +103,8 @@ static void spear_clocksource_init(void)
        val |= CTRL_ENABLE ;
        writew(val, gpt_base + CR(CLKSRC));
 
-       clocksource_calc_mult_shift(&clksrc, tick_rate, SPEAR_MIN_RANGE);
-
        /* register the clocksource */
-       clocksource_register(&clksrc);
+       clocksource_register_hz(&clksrc, tick_rate);
 }
 
 static struct clock_event_device clkevt = {