diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /arch/mips/dec/ioasic-irq.c | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
Merge branch 'master' of /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 4c7cb4048d35..3acb133668dc 100644 --- a/arch/mips/dec/ioasic-irq.c +++ b/arch/mips/dec/ioasic-irq.c | |||
| @@ -62,7 +62,7 @@ static inline void end_ioasic_irq(unsigned int irq) | |||
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | static struct irq_chip ioasic_irq_type = { | 64 | static struct irq_chip ioasic_irq_type = { |
| 65 | .typename = "IO-ASIC", | 65 | .name = "IO-ASIC", |
| 66 | .ack = ack_ioasic_irq, | 66 | .ack = ack_ioasic_irq, |
| 67 | .mask = mask_ioasic_irq, | 67 | .mask = mask_ioasic_irq, |
| 68 | .mask_ack = ack_ioasic_irq, | 68 | .mask_ack = ack_ioasic_irq, |
| @@ -84,7 +84,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq) | |||
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | static struct irq_chip ioasic_dma_irq_type = { | 86 | static struct irq_chip ioasic_dma_irq_type = { |
| 87 | .typename = "IO-ASIC-DMA", | 87 | .name = "IO-ASIC-DMA", |
| 88 | .ack = ack_ioasic_dma_irq, | 88 | .ack = ack_ioasic_dma_irq, |
| 89 | .mask = mask_ioasic_dma_irq, | 89 | .mask = mask_ioasic_dma_irq, |
| 90 | .mask_ack = ack_ioasic_dma_irq, | 90 | .mask_ack = ack_ioasic_dma_irq, |