summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/timer-gp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-04 16:51:58 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-04 16:51:58 -0800
commit005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch)
treebc3ef1b64dcdb48b2d6accb51951a0d73b33262e /arch/arm/mach-omap2/timer-gp.c
parent4d7902f22b0804730b80f7a4147f676430248a3a (diff)
parenteda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
-rw-r--r--arch/arm/mach-omap2/timer-gp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index ae6036300f60..9fc13a2cc3f4 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -118,7 +118,8 @@ static void __init omap2_gp_clockevent_init(void)
clockevent_gpt.max_delta_ns =
clockevent_delta2ns(0xffffffff, &clockevent_gpt);
clockevent_gpt.min_delta_ns =
- clockevent_delta2ns(1, &clockevent_gpt);
+ clockevent_delta2ns(3, &clockevent_gpt);
+ /* Timer internal resynch latency. */
clockevent_gpt.cpumask = cpumask_of(0);
clockevents_register_device(&clockevent_gpt);