linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / vr41xx / nec-cmbvr4133 / irq.c

diff --git a/arch/mips/vr41xx/nec-cmbvr4133/irq.c b/arch/mips/vr41xx/nec-cmbvr4133/irq.c
index 2483487..31db6b6 100644 (file)
--- a/arch/mips/vr41xx/nec-cmbvr4133/irq.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/irq.c
@@ -62,7 +62,7 @@ static void end_i8259_irq(unsigned int irq)
                enable_8259A_irq(irq - I8259_IRQ_BASE);
 }
 
-static struct irq_chip i8259_irq_type = {
+static struct hw_interrupt_type i8259_irq_type = {
        .typename       = "XT-PIC",
        .startup        = startup_i8259_irq,
        .shutdown       = shutdown_i8259_irq,
@@ -104,7 +104,7 @@ void __init rockhopper_init_irq(void)
        }
 
        for (i = I8259_IRQ_BASE; i <= I8259_IRQ_LAST; i++)
-               irq_desc[i].chip = &i8259_irq_type;
+               irq_desc[i].handler = &i8259_irq_type;
 
        setup_irq(I8259_SLAVE_IRQ, &i8259_slave_cascade);