diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
| commit | ad73c67e792c752ddc99f2b0587abae05255dd6d (patch) | |
| tree | e33d5d37a8c56b6fad753fa2d481f43cfb60ae1d /arch/arm/mach-iop3xx/iop321-irq.c | |
| parent | 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-iop3xx/iop321-irq.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/iop321-irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/iop321-irq.c b/arch/arm/mach-iop3xx/iop321-irq.c index d42aae6aef03..88ac333472c8 100644 --- a/arch/arm/mach-iop3xx/iop321-irq.c +++ b/arch/arm/mach-iop3xx/iop321-irq.c | |||
| @@ -52,7 +52,8 @@ iop321_irq_unmask (unsigned int irq) | |||
| 52 | intctl_write(iop321_mask); | 52 | intctl_write(iop321_mask); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | struct irqchip ext_chip = { | 55 | struct irq_chip ext_chip = { |
| 56 | .name = "IOP", | ||
| 56 | .ack = iop321_irq_mask, | 57 | .ack = iop321_irq_mask, |
| 57 | .mask = iop321_irq_mask, | 58 | .mask = iop321_irq_mask, |
| 58 | .unmask = iop321_irq_unmask, | 59 | .unmask = iop321_irq_unmask, |