Merge branch 'master' into for-linus

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / powermac / smp.c

diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 6d4da7b46b419a751891e74b02554d6b7e0a89e1..937a38e73178c0c7168bf27b75913e69c3d2f9c0 100644 (file)
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -408,7 +408,7 @@ static void __init smp_psurge_setup_cpu(int cpu_nr)
        /* reset the entry point so if we get another intr we won't
         * try to startup again */
        out_be32(psurge_start, 0x100);
-       if (setup_irq(30, &psurge_irqaction))
+       if (setup_irq(irq_create_mapping(NULL, 30), &psurge_irqaction))
                printk(KERN_ERR "Couldn't get primary IPI interrupt");
 }