diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2006-06-23 05:04:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:43:01 -0400 |
commit | 1a23989475846547e5b7ce14e77f072894aaff54 (patch) | |
tree | 8cc8726619f50ffcb62433e6548fd285da252922 /arch/m68k/mac/macints.c | |
parent | 6d2f16a8917eb77a8b79849686159f3a5eae2501 (diff) |
[PATCH] m68k: m68k mac VIA2 fixes and cleanups
Some fixes and cleanups from the linux-mac68k repo. Fix mac_esp by clearing
the VIA2 SCSI IRQ flag before the SCSI IRQ handler is invoked. Also fix a
race condition caused by unmasking a nubus slot IRQ then setting the relevant
nubus_active bit.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/mac/macints.c')
-rw-r--r-- | arch/m68k/mac/macints.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c index 1809601ad903..7a1600bd195d 100644 --- a/arch/m68k/mac/macints.c +++ b/arch/m68k/mac/macints.c | |||
@@ -216,7 +216,6 @@ static void scc_irq_disable(int); | |||
216 | * console_loglevel determines NMI handler function | 216 | * console_loglevel determines NMI handler function |
217 | */ | 217 | */ |
218 | 218 | ||
219 | extern irqreturn_t mac_bang(int, void *, struct pt_regs *); | ||
220 | irqreturn_t mac_nmi_handler(int, void *, struct pt_regs *); | 219 | irqreturn_t mac_nmi_handler(int, void *, struct pt_regs *); |
221 | irqreturn_t mac_debug_handler(int, void *, struct pt_regs *); | 220 | irqreturn_t mac_debug_handler(int, void *, struct pt_regs *); |
222 | 221 | ||