[PATCH] m68k: convert generic irq code to irq controller

Convert the generic irq code to use irq controller, this gets rid of the
machine specific callbacks and gives better control over irq handling without
duplicating lots of code.

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>

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index b19b951fd3e7..e86de7b061cd 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -87,16 +87,15 @@ void __init trap_init (void)
 {
         int i;
 
-        vectors[VEC_SPUR] = bad_inthandler;
-        for (i = VEC_INT1; i <= VEC_INT7; i++)
-                vectors[i] = auto_inthandler;
+        for (i = VEC_SPUR; i <= VEC_INT7; i++)
+                vectors[i] = bad_inthandler;
 
         for (i = 0; i < VEC_USER; i++)
                 if (!vectors[i])
                         vectors[i] = trap;
 
         for (i = VEC_USER; i < 256; i++)
-                vectors[i] = mach_inthandler;
+                vectors[i] = bad_inthandler;
 
 #ifdef CONFIG_M68KFPU_EMU
         if (FPU_IS_EMU)