summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/traps.h
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 14:47:01 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 19:00:57 +0200
commit68387c448b7f2b3e2bfa0f606391cd3b602b1997 (patch)
treea6a5d209ae09a3bbaf4e1614ea4b2bd4920e6c56 /include/asm-m68k/traps.h
parent[PATCH] m68k: introduce irq controller (diff)
downloadlinux-68387c448b7f2b3e2bfa0f606391cd3b602b1997.tar.xz
linux-68387c448b7f2b3e2bfa0f606391cd3b602b1997.zip
[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>
Diffstat (limited to 'include/asm-m68k/traps.h')
-rw-r--r--include/asm-m68k/traps.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/traps.h b/include/asm-m68k/traps.h
index 771519473285..8caef25624c7 100644
--- a/include/asm-m68k/traps.h
+++ b/include/asm-m68k/traps.h
@@ -19,7 +19,7 @@
typedef void (*e_vector)(void);
asmlinkage void auto_inthandler(void);
-asmlinkage void mach_inthandler(void);
+asmlinkage void user_inthandler(void);
asmlinkage void bad_inthandler(void);
extern e_vector vectors[];