vserver 1.9.3

[linux-2.6.git] / arch / ppc / platforms / pmac_smp.c

diff --git a/arch/ppc/platforms/pmac_smp.c b/arch/ppc/platforms/pmac_smp.c
index ff80725..1a300ff 100644 (file)
--- a/arch/ppc/platforms/pmac_smp.c
+++ b/arch/ppc/platforms/pmac_smp.c
@@ -32,13 +32,13 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
+#include <linux/hardirq.h>
 
 #include <asm/ptrace.h>
 #include <asm/atomic.h>
 #include <asm/irq.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/hardirq.h>
 #include <asm/sections.h>
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -421,7 +421,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 (request_irq(30, psurge_primary_intr, SA_INTERRUPT, "primary IPI", 0))
+               if (request_irq(30, psurge_primary_intr, SA_INTERRUPT, "primary IPI", NULL))
                        printk(KERN_ERR "Couldn't get primary IPI interrupt");
        }