Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / asm-powerpc / xmon.h

diff --git a/include/asm-powerpc/xmon.h b/include/asm-powerpc/xmon.h
index ca5f33277e0c320f9d884f78ef8d0d853d84b909..43f7129984c723312c3ca394ccf32fe53d52a4e8 100644 (file)
--- a/include/asm-powerpc/xmon.h
+++ b/include/asm-powerpc/xmon.h
@@ -4,7 +4,7 @@
 
 struct pt_regs;
 
-extern void xmon(struct pt_regs *excp);
+extern int xmon(struct pt_regs *excp);
 extern void xmon_printf(const char *fmt, ...);
 extern void xmon_init(int);