git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
asm-x86_64
/
kexec.h
diff --git
a/include/asm-x86_64/kexec.h
b/include/asm-x86_64/kexec.h
index
ae28cd4
..
c564bae
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>
/*