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-mxc / epit.c

diff --git a/arch/arm/plat-mxc/epit.c b/arch/arm/plat-mxc/epit.c
index ee9582f4972e87da83c0d6c29d196e31dd612651..d69d343ff61f1989cdfb1982b000eccc9aeb8d1d 100644 (file)
--- a/arch/arm/plat-mxc/epit.c
+++ b/arch/arm/plat-mxc/epit.c
@@ -93,7 +93,6 @@ static struct clocksource clocksource_epit = {
        .rating         = 200,
        .read           = epit_read,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -101,9 +100,7 @@ static int __init epit_clocksource_init(struct clk *timer_clk)
 {
        unsigned int c = clk_get_rate(timer_clk);
 
-       clocksource_epit.mult = clocksource_hz2mult(c,
-                                       clocksource_epit.shift);
-       clocksource_register(&clocksource_epit);
+       clocksource_register_hz(&clocksource_epit, c);
 
        return 0;
 }