This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
index 102ac19..3a404a8 100644 (file)
--- a/arch/ppc/platforms/sbc82xx.c
+++ b/arch/ppc/platforms/sbc82xx.c
@@ -142,17 +142,10 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re
                        return IRQ_HANDLED;
                }
        }
-       __do_IRQ(NR_SIU_INTS + irq, regs);
+       ppc_irq_dispatch_handler(regs, NR_SIU_INTS + irq);
        return IRQ_HANDLED;
 }
 
-static struct irqaction sbc82xx_i8259_irqaction = {
-       .handler = sbc82xx_i8259_demux,
-       .flags = SA_INTERRUPT,
-       .mask = CPU_MASK_NONE,
-       .name = "i8259 demux",
-};
-
 void __init sbc82xx_init_IRQ(void)
 {
        volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl;
@@ -193,7 +186,8 @@ void __init sbc82xx_init_IRQ(void)
        sbc82xx_i8259_map[1] = sbc82xx_i8259_mask; /* Set interrupt mask */
 
        /* Request cascade IRQ */
-       if (setup_irq(SIU_INT_IRQ6, &sbc82xx_i8259_irqaction)) {
+       if (request_irq(SIU_INT_IRQ6, sbc82xx_i8259_demux, SA_INTERRUPT,
+                       "i8259 demux", 0)) {
                printk("Installation of i8259 IRQ demultiplexer failed.\n");
        }
 }