diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/mips/dec/ioasic-irq.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/dec/ioasic-irq.c')
| -rw-r--r-- | arch/mips/dec/ioasic-irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c index da2dbb42f913..41cd2a96148b 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) | |||
| 93 | enable_ioasic_irq(irq); | 93 | enable_ioasic_irq(irq); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | static struct hw_interrupt_type ioasic_irq_type = { | 96 | static struct irq_chip ioasic_irq_type = { |
| 97 | .typename = "IO-ASIC", | 97 | .typename = "IO-ASIC", |
| 98 | .startup = startup_ioasic_irq, | 98 | .startup = startup_ioasic_irq, |
| 99 | .shutdown = shutdown_ioasic_irq, | 99 | .shutdown = shutdown_ioasic_irq, |
| @@ -121,7 +121,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq) | |||
| 121 | end_ioasic_irq(irq); | 121 | end_ioasic_irq(irq); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | static struct hw_interrupt_type ioasic_dma_irq_type = { | 124 | static struct irq_chip ioasic_dma_irq_type = { |
| 125 | .typename = "IO-ASIC-DMA", | 125 | .typename = "IO-ASIC-DMA", |
| 126 | .startup = startup_ioasic_dma_irq, | 126 | .startup = startup_ioasic_dma_irq, |
| 127 | .shutdown = shutdown_ioasic_dma_irq, | 127 | .shutdown = shutdown_ioasic_dma_irq, |