linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
index 60b769c..74c9ff7 100644 (file)
--- a/arch/ppc/platforms/sbc82xx.c
+++ b/arch/ppc/platforms/sbc82xx.c
@@ -1,4 +1,6 @@
 /*
+ * arch/ppc/platforms/sbc82xx.c
+ *
  * SBC82XX platform support
  *
  * Author: Guy Streeter <streeter@redhat.com>
@@ -13,6 +15,7 @@
  * option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
@@ -145,7 +148,7 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re
 
 static struct irqaction sbc82xx_i8259_irqaction = {
        .handler = sbc82xx_i8259_demux,
-       .flags = IRQF_DISABLED,
+       .flags = SA_INTERRUPT,
        .mask = CPU_MASK_NONE,
        .name = "i8259 demux",
 };
@@ -171,7 +174,7 @@ void __init sbc82xx_init_IRQ(void)
        
        /* Set up the interrupt handlers for the i8259 IRQs */
        for (i = NR_SIU_INTS; i < NR_SIU_INTS + 8; i++) {
-                irq_desc[i].chip = &sbc82xx_i8259_ic;
+                irq_desc[i].handler = &sbc82xx_i8259_ic;
                irq_desc[i].status |= IRQ_LEVEL;
        }