diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /include/asm-x86_64/kexec.h | |
parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
download | op-kernel-dev-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.zip op-kernel-dev-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.tar.gz |
Merge branch 'master'
Diffstat (limited to 'include/asm-x86_64/kexec.h')
-rw-r--r-- | include/asm-x86_64/kexec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86_64/kexec.h b/include/asm-x86_64/kexec.h index ae28cd4..c564bae 100644 --- 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> /* |