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-stmp3xxx / timer.c

diff --git a/arch/arm/plat-stmp3xxx/timer.c b/arch/arm/plat-stmp3xxx/timer.c
index 063c7bc0e740baf52dc6e345347d1241f3b431f7..c395630a6edcba2efb676f6f1b209189953a863c 100644 (file)
--- a/arch/arm/plat-stmp3xxx/timer.c
+++ b/arch/arm/plat-stmp3xxx/timer.c
@@ -89,7 +89,6 @@ static struct clocksource cksrc_stmp3xxx = {
        .rating         = 250,
        .read           = stmp3xxx_clock_read,
        .mask           = CLOCKSOURCE_MASK(16),
-       .shift          = 10,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -106,8 +105,6 @@ static struct irqaction stmp3xxx_timer_irq = {
  */
 static void __init stmp3xxx_init_timer(void)
 {
-       cksrc_stmp3xxx.mult = clocksource_hz2mult(CLOCK_TICK_RATE,
-                               cksrc_stmp3xxx.shift);
        ckevt_timrot.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC,
                                ckevt_timrot.shift);
        ckevt_timrot.min_delta_ns = clockevent_delta2ns(2, &ckevt_timrot);
@@ -140,7 +137,7 @@ static void __init stmp3xxx_init_timer(void)
 
        setup_irq(IRQ_TIMER0, &stmp3xxx_timer_irq);
 
-       clocksource_register(&cksrc_stmp3xxx);
+       clocksource_register_hz(&cksrc_stmp3xxx, CLOCK_TICK_RATE);
        clockevents_register_device(&ckevt_timrot);
 }