From 2e6a32722c28da1374b3322ab6094e2b33891bd6 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 23 Jan 2008 12:34:16 +0000 Subject: [PATCH] --- yaml --- r: 77576 b: refs/heads/master c: dd01b2fc79a567ae03d0c96ddf61eb4de729d36d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 004206ceba96..b248766b5812 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd8e7af8d0fd3febc87607214d5dd545089edc71 +refs/heads/master: dd01b2fc79a567ae03d0c96ddf61eb4de729d36d diff --git a/trunk/arch/arm/mach-pxa/time.c b/trunk/arch/arm/mach-pxa/time.c index ac0bbad35238..7b7c0179795b 100644 --- a/trunk/arch/arm/mach-pxa/time.c +++ b/trunk/arch/arm/mach-pxa/time.c @@ -169,7 +169,7 @@ static void __init pxa_timer_init(void) ckevt_pxa_osmr0.max_delta_ns = clockevent_delta2ns(0x7fffffff, &ckevt_pxa_osmr0); ckevt_pxa_osmr0.min_delta_ns = - clockevent_delta2ns(MIN_OSCR_DELTA, &ckevt_pxa_osmr0) + 1; + clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_pxa_osmr0) + 1; cksrc_pxa_oscr0.mult = clocksource_hz2mult(clock_tick_rate, cksrc_pxa_oscr0.shift);