Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[net-next-2.6.git] / drivers / clocksource / sh_cmt.c

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index f3d3898898ed9675786c76ff3d837d968517fa68..717305d30444479d67130194a7f922173254da75 100644 (file)
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -449,7 +449,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p,
        clk_disable(p->clk);
 
        /* TODO: calculate good shift from rate and counter bit width */
-       cs->shift = 10;
+       cs->shift = 0;
        cs->mult = clocksource_hz2mult(p->rate, cs->shift);
 
        dev_info(&p->pdev->dev, "used as clock source\n");