diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/mips/kernel/irq-rm7000.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/mips/kernel/irq-rm7000.c')
| -rw-r--r-- | arch/mips/kernel/irq-rm7000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c index 971adf6ef4f4..fb50cc78b28b 100644 --- a/arch/mips/kernel/irq-rm7000.c +++ b/arch/mips/kernel/irq-rm7000.c | |||
| @@ -33,6 +33,7 @@ static struct irq_chip rm7k_irq_controller = { | |||
| 33 | .mask = mask_rm7k_irq, | 33 | .mask = mask_rm7k_irq, |
| 34 | .mask_ack = mask_rm7k_irq, | 34 | .mask_ack = mask_rm7k_irq, |
| 35 | .unmask = unmask_rm7k_irq, | 35 | .unmask = unmask_rm7k_irq, |
| 36 | .eoi = unmask_rm7k_irq | ||
| 36 | }; | 37 | }; |
| 37 | 38 | ||
| 38 | void __init rm7k_cpu_irq_init(void) | 39 | void __init rm7k_cpu_irq_init(void) |