Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-block.git] / include / asm-x86 / system_32.h

diff --git a/include/asm-x86/system_32.h b/include/asm-x86/system_32.h
index db6283eb5e46d6f53ff24d33b0a5ec091e5a9fd0..ef8468883bac59a4451562ce1fc190e81ea85bc6 100644 (file)
--- a/include/asm-x86/system_32.h
+++ b/include/asm-x86/system_32.h
@@ -315,5 +315,6 @@ extern unsigned long arch_align_stack(unsigned long sp);
 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
 
 void default_idle(void);
+void __show_registers(struct pt_regs *, int all);
 
 #endif