Merge branch 'master'

[linux-2.6] / arch / ppc / platforms / pplus.c

diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c
index 93e9c7b889f7896c66b6a23da731567f1afb2199..22bd40cfb0928f7b2d37a88f4b7299cd4ed3a803 100644 (file)
--- a/arch/ppc/platforms/pplus.c
+++ b/arch/ppc/platforms/pplus.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/console.h>
 #include <linux/pci.h>
-#include <linux/irq.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
@@ -666,10 +665,7 @@ static void __init pplus_init_IRQ(void)
                ppc_md.get_irq = openpic_get_irq;
        }
 
-       for (i = 0; i < NUM_8259_INTERRUPTS; i++)
-               irq_desc[i].handler = &i8259_pic;
-
-       i8259_init(0);
+       i8259_init(0, 0);
 
        if (ppc_md.progress)
                ppc_md.progress("init_irq: exit", 0);
@@ -904,6 +900,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
        ppc_md.kgdb_map_scc = gen550_kgdb_map_scc;
 #endif
 #ifdef CONFIG_SMP
-       ppc_md.smp_ops = &pplus_smp_ops;
+       smp_ops = &pplus_smp_ops;
 #endif                         /* CONFIG_SMP */
 }