diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /arch/arm/mach-omap2/timer-gp.c | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 3 |
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) | |||
| 118 | clockevent_gpt.max_delta_ns = | 118 | clockevent_gpt.max_delta_ns = |
| 119 | clockevent_delta2ns(0xffffffff, &clockevent_gpt); | 119 | clockevent_delta2ns(0xffffffff, &clockevent_gpt); |
| 120 | clockevent_gpt.min_delta_ns = | 120 | clockevent_gpt.min_delta_ns = |
| 121 | clockevent_delta2ns(1, &clockevent_gpt); | 121 | clockevent_delta2ns(3, &clockevent_gpt); |
| 122 | /* Timer internal resynch latency. */ | ||
| 122 | 123 | ||
| 123 | clockevent_gpt.cpumask = cpumask_of(0); | 124 | clockevent_gpt.cpumask = cpumask_of(0); |
| 124 | clockevents_register_device(&clockevent_gpt); | 125 | clockevents_register_device(&clockevent_gpt); |