diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /arch/mips/sni/irq.c | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/sni/irq.c')
| -rw-r--r-- | arch/mips/sni/irq.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c index 141a310d74d8..952038aa4b90 100644 --- a/arch/mips/sni/irq.c +++ b/arch/mips/sni/irq.c | |||
| @@ -58,14 +58,13 @@ static void end_pciasic_irq(unsigned int irq) | |||
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static struct hw_interrupt_type pciasic_irq_type = { | 60 | static struct hw_interrupt_type pciasic_irq_type = { |
| 61 | "ASIC-PCI", | 61 | .typename = "ASIC-PCI", |
| 62 | startup_pciasic_irq, | 62 | .startup = startup_pciasic_irq, |
| 63 | shutdown_pciasic_irq, | 63 | .shutdown = shutdown_pciasic_irq, |
| 64 | enable_pciasic_irq, | 64 | .enable = enable_pciasic_irq, |
| 65 | disable_pciasic_irq, | 65 | .disable = disable_pciasic_irq, |
| 66 | mask_and_ack_pciasic_irq, | 66 | .ack = mask_and_ack_pciasic_irq, |
| 67 | end_pciasic_irq, | 67 | .end = end_pciasic_irq, |
| 68 | NULL | ||
| 69 | }; | 68 | }; |
| 70 | 69 | ||
| 71 | /* | 70 | /* |