diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /arch/mips/dec/ioasic-irq.c | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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, |