aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac/config.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2006-06-23 05:04:59 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:01 -0400
commit1a23989475846547e5b7ce14e77f072894aaff54 (patch)
tree8cc8726619f50ffcb62433e6548fd285da252922 /arch/m68k/mac/config.c
parent6d2f16a8917eb77a8b79849686159f3a5eae2501 (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/config.c')
-rw-r--r--arch/m68k/mac/config.c13
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);
89 89
90static void mac_get_model(char *str); 90static void mac_get_model(char *str);
91 91
92void mac_bang(int irq, void *vector, struct pt_regs *p)
93{
94 printk(KERN_INFO "Resetting ...\n");
95 mac_reset();
96}
97
98static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *)) 92static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *))
99{ 93{
100 via_init_clock(vector); 94 via_init_clock(vector);
101} 95}
102 96
103#if 0
104void mac_waitbut (void)
105{
106 ;
107}
108#endif
109
110extern irqreturn_t mac_default_handler(int, void *, struct pt_regs *); 97extern irqreturn_t mac_default_handler(int, void *, struct pt_regs *);
111 98
112irqreturn_t (*mac_handlers[8])(int, void *, struct pt_regs *)= 99irqreturn_t (*mac_handlers[8])(int, void *, struct pt_regs *)=