summaryrefslogtreecommitdiff
path: root/arch/m68k/platform/coldfire/vectors.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-08-04 11:09:27 +0400
committerIngo Molnar <mingo@elte.hu>2011-08-04 11:09:27 +0400
commitd7619fe39d9769b4d4545cc511c891deea18ae08 (patch)
tree0a902533414001075b2245825e145cc2e35ce985 /arch/m68k/platform/coldfire/vectors.c
parent9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae (diff)
parented8f37370d83e695c0a4fa5d5fc7a83ecb947526 (diff)
downloadlinux-d7619fe39d9769b4d4545cc511c891deea18ae08.tar.xz
Merge branch 'linus' into core/urgent
Diffstat (limited to 'arch/m68k/platform/coldfire/vectors.c')
-rw-r--r--arch/m68k/platform/coldfire/vectors.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/m68k/platform/coldfire/vectors.c b/arch/m68k/platform/coldfire/vectors.c
index a21d3f870b7a..3a7cc524ecd3 100644
--- a/arch/m68k/platform/coldfire/vectors.c
+++ b/arch/m68k/platform/coldfire/vectors.c
@@ -35,21 +35,13 @@ asmlinkage void dbginterrupt_c(struct frame *fp)
extern e_vector *_ramvec;
-void set_evector(int vecnum, void (*handler)(void))
-{
- if (vecnum >= 0 && vecnum <= 255)
- _ramvec[vecnum] = handler;
-}
-
-/***************************************************************************/
-
/* Assembler routines */
asmlinkage void buserr(void);
asmlinkage void trap(void);
asmlinkage void system_call(void);
asmlinkage void inthandler(void);
-void __init init_vectors(void)
+void __init trap_init(void)
{
int i;