Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / asm-sh / kexec.h

diff --git a/include/asm-sh/kexec.h b/include/asm-sh/kexec.h
index a5f85e9e428d21fa1a591295a4800db440a722ea..9d235af20cdd551136beefd6968e72e4984c0f5b 100644 (file)
--- a/include/asm-sh/kexec.h
+++ b/include/asm-sh/kexec.h
@@ -25,11 +25,8 @@
 
 #define MAX_NOTE_BYTES 1024
 
-#ifndef __ASSEMBLY__
-
-extern void machine_shutdown(void);
-extern void *crash_notes;
-
-#endif /* __ASSEMBLY__ */
+/* Provide a dummy definition to avoid build failures. */
+static inline void crash_setup_regs(struct pt_regs *newregs,
+                                       struct pt_regs *oldregs) { }
 
 #endif /* _SH_KEXEC_H */