diff options
| author | Jeff Garzik | 2005-10-29 23:49:12 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-10-29 23:49:12 +0200 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /arch/mips/sni/irq.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.gz kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.xz kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.zip | |
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) } static struct hw_interrupt_type pciasic_irq_type = { - "ASIC-PCI", - startup_pciasic_irq, - shutdown_pciasic_irq, - enable_pciasic_irq, - disable_pciasic_irq, - mask_and_ack_pciasic_irq, - end_pciasic_irq, - NULL + .typename = "ASIC-PCI", + .startup = startup_pciasic_irq, + .shutdown = shutdown_pciasic_irq, + .enable = enable_pciasic_irq, + .disable = disable_pciasic_irq, + .ack = mask_and_ack_pciasic_irq, + .end = end_pciasic_irq, }; /* |