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 / at91sam926x_time.c

diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c
index 608a63240b64ba9944f511ea9c48879d7878fb08..4ba85499fa979b8503b2e86ab9aa5c2786266b1c 100644 (file)
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
@@ -51,7 +51,6 @@ static struct clocksource pit_clk = {
        .name           = "pit",
        .rating         = 175,
        .read           = read_pit_clk,
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -163,10 +162,9 @@ static void __init at91sam926x_pit_init(void)
         * Register clocksource.  The high order bits of PIV are unused,
         * so this isn't a 32-bit counter unless we get clockevent irqs.
         */
-       pit_clk.mult = clocksource_hz2mult(pit_rate, pit_clk.shift);
        bits = 12 /* PICNT */ + ilog2(pit_cycle) /* PIV */;
        pit_clk.mask = CLOCKSOURCE_MASK(bits);
-       clocksource_register(&pit_clk);
+       clocksource_register_hz(&pit_clk, pit_rate);
 
        /* Set up irq handler */
        setup_irq(AT91_ID_SYS, &at91sam926x_pit_irq);