diff options
| author | Finn Thain | 2006-06-23 11:04:59 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-06-23 16:43:01 +0200 |
| commit | 1a23989475846547e5b7ce14e77f072894aaff54 (patch) | |
| tree | 8cc8726619f50ffcb62433e6548fd285da252922 /arch/m68k/mac/config.c | |
| parent | [PATCH] m68k: adjust to changed HARDIRQ_MASK (diff) | |
| download | kernel-qcow2-linux-1a23989475846547e5b7ce14e77f072894aaff54.tar.gz kernel-qcow2-linux-1a23989475846547e5b7ce14e77f072894aaff54.tar.xz kernel-qcow2-linux-1a23989475846547e5b7ce14e77f072894aaff54.zip | |
[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/config.c')
| -rw-r--r-- | arch/m68k/mac/config.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 14f8d3f4e195..19dce75711b1 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -89,24 +89,11 @@ extern void mac_debugging_long(int, long); static void mac_get_model(char *str); -void mac_bang(int irq, void *vector, struct pt_regs *p) -{ - printk(KERN_INFO "Resetting ...\n"); - mac_reset(); -} - static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *)) { via_init_clock(vector); } -#if 0 -void mac_waitbut (void) -{ - ; -} -#endif - extern irqreturn_t mac_default_handler(int, void *, struct pt_regs *); irqreturn_t (*mac_handlers[8])(int, void *, struct pt_regs *)= |