Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / include / asm-x86 / reboot.h

diff --git a/include/asm-x86/reboot.h b/include/asm-x86/reboot.h
index e9e3ffc22c0719e7b7f0c30be74460df9e030fec..206f355786dc5651b11777305974b281bb7a4e9f 100644 (file)
--- a/include/asm-x86/reboot.h
+++ b/include/asm-x86/reboot.h
@@ -3,8 +3,7 @@
 
 struct pt_regs;
 
-struct machine_ops
-{
+struct machine_ops {
        void (*restart)(char *cmd);
        void (*halt)(void);
        void (*power_off)(void);
@@ -15,6 +14,8 @@ struct machine_ops
 
 extern struct machine_ops machine_ops;
 
-void machine_real_restart(unsigned char *code, int length);
+void native_machine_crash_shutdown(struct pt_regs *regs);
+void native_machine_shutdown(void);
+void machine_real_restart(const unsigned char *code, int length);
 
 #endif /* _ASM_REBOOT_H */