Merge branch 'x86-64'

[linux-2.6-omap-h63xx.git] / include / asm-x86_64 / kexec.h

diff --git a/include/asm-x86_64/kexec.h b/include/asm-x86_64/kexec.h
index ae28cd44bcd3158433641c67e3afdf26a1a25cd8..c564bae034338272e952c05fb84646b9b60a669f 100644 (file)
--- a/include/asm-x86_64/kexec.h
+++ b/include/asm-x86_64/kexec.h
@@ -1,8 +1,9 @@
 #ifndef _X86_64_KEXEC_H
 #define _X86_64_KEXEC_H
 
+#include <linux/string.h>
+
 #include <asm/page.h>
-#include <asm/proto.h>
 #include <asm/ptrace.h>
 
 /*