diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/mips/momentum/ocelot_c/cpci-irq.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/mips/momentum/ocelot_c/cpci-irq.c')
| -rw-r--r-- | arch/mips/momentum/ocelot_c/cpci-irq.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c index dea48b3ad687..bd885785e2f9 100644 --- a/arch/mips/momentum/ocelot_c/cpci-irq.c +++ b/arch/mips/momentum/ocelot_c/cpci-irq.c | |||
| @@ -129,14 +129,13 @@ void ll_cpci_irq(struct pt_regs *regs) | |||
| 129 | #define shutdown_cpci_irq disable_cpci_irq | 129 | #define shutdown_cpci_irq disable_cpci_irq |
| 130 | 130 | ||
| 131 | struct hw_interrupt_type cpci_irq_type = { | 131 | struct hw_interrupt_type cpci_irq_type = { |
| 132 | "CPCI/FPGA", | 132 | .typename = "CPCI/FPGA", |
| 133 | startup_cpci_irq, | 133 | .startup = startup_cpci_irq, |
| 134 | shutdown_cpci_irq, | 134 | .shutdown = shutdown_cpci_irq, |
| 135 | enable_cpci_irq, | 135 | .enable = enable_cpci_irq, |
| 136 | disable_cpci_irq, | 136 | .disable = disable_cpci_irq, |
| 137 | mask_and_ack_cpci_irq, | 137 | .ack = mask_and_ack_cpci_irq, |
| 138 | end_cpci_irq, | 138 | .end = end_cpci_irq, |
| 139 | NULL | ||
| 140 | }; | 139 | }; |
| 141 | 140 | ||
| 142 | void cpci_irq_init(void) | 141 | void cpci_irq_init(void) |