powerpc: Merge i8259.c into arch/powerpc/sysdev

This changes the parameters for i8259_init so that it takes two
parameters: a physical address for generating an interrupt
acknowledge cycle, and an interrupt number offset.  i8259_init
now sets the irq_desc[] for its interrupts; all the callers
were doing this, and that code is gone now.  This also defines
a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and
makes the platforms that need it select that symbol.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 1 insertions, 9 deletions

diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index d4c9781989f..9eeed357230 100644
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -494,18 +494,10 @@ sandpoint_init_IRQ(void)
                         i8259_irq);
 
         /*
-         * openpic_init() has set up irq_desc[16-31] to be openpic
-         * interrupts.  We need to set irq_desc[0-15] to be i8259
-         * interrupts.
-         */
-        for(i=0; i < NUM_8259_INTERRUPTS; i++)
-                irq_desc[i].handler = &i8259_pic;
-
-        /*
          * The EPIC allows for a read in the range of 0xFEF00000 ->
          * 0xFEFFFFFF to generate a PCI interrupt-acknowledge transaction.
          */
-        i8259_init(0xfef00000);
+        i8259_init(0xfef00000, 0);
 }
 
 static unsigned long __init