Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / timer-gp.c

diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 3e66a9a1519c23339567b5ef3b5ba0e08a9b2789..8351a34f3e19c1568c6cb64acf724c2068e1d206 100644 (file)
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -124,7 +124,7 @@ static void __init omap2_gp_clockevent_init(void)
                clockevent_delta2ns(3, &clockevent_gpt);
                /* Timer internal resynch latency. */
 
-       clockevent_gpt.cpumask = cpumask_of_cpu(0);
+       clockevent_gpt.cpumask = cpumask_of(0);
        clockevents_register_device(&clockevent_gpt);
 }