Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-m68k / traps.h

diff --git a/include/asm-m68k/traps.h b/include/asm-m68k/traps.h
index 771519473285cf12d2681005bc95292c560195a5..8caef25624c7decedaca65c84693cab98a2a65e9 100644 (file)
--- 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[];