Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / include / asm-i386 / emergency-restart.h

diff --git a/include/asm-i386/emergency-restart.h b/include/asm-i386/emergency-restart.h
index 108d8c48e42e86978077354f2fa1b151f25c41df..680c3956334542d75617e6d89b82298f906e250a 100644 (file)
--- a/include/asm-i386/emergency-restart.h
+++ b/include/asm-i386/emergency-restart.h
@@ -1,6 +1,6 @@
 #ifndef _ASM_EMERGENCY_RESTART_H
 #define _ASM_EMERGENCY_RESTART_H
 
-#include <asm-generic/emergency-restart.h>
+extern void machine_emergency_restart(void);
 
 #endif /* _ASM_EMERGENCY_RESTART_H */