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

[mv-sheeva.git] / arch / arm / mach-at91 / at91rm9200_time.c

diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c
index 2500f41d8d2dba517e4cf1d72cf1af225a765d6a..1dd69c85dfecc4c3583bd9cc511a675b3376bf45 100644 (file)
--- a/arch/arm/mach-at91/at91rm9200_time.c
+++ b/arch/arm/mach-at91/at91rm9200_time.c
@@ -101,7 +101,6 @@ static struct clocksource clk32k = {
        .rating         = 150,
        .read           = read_clk32k,
        .mask           = CLOCKSOURCE_MASK(20),
-       .shift          = 10,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -201,8 +200,7 @@ void __init at91rm9200_timer_init(void)
        clockevents_register_device(&clkevt);
 
        /* register clocksource */
-       clk32k.mult = clocksource_hz2mult(AT91_SLOW_CLOCK, clk32k.shift);
-       clocksource_register(&clk32k);
+       clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK);
 }
 
 struct sys_timer at91rm9200_timer = {