X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fdec%2Fioasic-irq.c;fp=arch%2Fmips%2Fdec%2Fioasic-irq.c;h=d5bca5d233b6e6b67d32546d7789b9be1052926f;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=41cd2a96148bcdf948edbe5fcec24c1c7485d110;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c index 41cd2a961..d5bca5d23 100644 --- a/arch/mips/dec/ioasic-irq.c +++ b/arch/mips/dec/ioasic-irq.c @@ -93,7 +93,7 @@ static inline void end_ioasic_irq(unsigned int irq) enable_ioasic_irq(irq); } -static struct irq_chip ioasic_irq_type = { +static struct hw_interrupt_type ioasic_irq_type = { .typename = "IO-ASIC", .startup = startup_ioasic_irq, .shutdown = shutdown_ioasic_irq, @@ -121,7 +121,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq) end_ioasic_irq(irq); } -static struct irq_chip ioasic_dma_irq_type = { +static struct hw_interrupt_type ioasic_dma_irq_type = { .typename = "IO-ASIC-DMA", .startup = startup_ioasic_dma_irq, .shutdown = shutdown_ioasic_dma_irq, @@ -144,13 +144,13 @@ void __init init_ioasic_irqs(int base) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].chip = &ioasic_irq_type; + irq_desc[i].handler = &ioasic_irq_type; } for (; i < base + IO_IRQ_LINES; i++) { irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].chip = &ioasic_dma_irq_type; + irq_desc[i].handler = &ioasic_dma_irq_type; } ioasic_irq_base = base;