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 commit 'v2.6.26' into x86/core
[pandora-kernel.git]
/
include
/
asm-x86
/
elf.h
diff --git
a/include/asm-x86/elf.h
b/include/asm-x86/elf.h
index
8f232dc
..
7be4733
100644
(file)
--- a/
include/asm-x86/elf.h
+++ b/
include/asm-x86/elf.h
@@
-83,9
+83,9
@@
extern unsigned int vdso_enabled;
(((x)->e_machine == EM_386) || ((x)->e_machine == EM_486))
#include <asm/processor.h>
+#include <asm/system.h>
#ifdef CONFIG_X86_32
-#include <asm/system.h> /* for savesegment */
#include <asm/desc.h>
#define elf_check_arch(x) elf_check_arch_ia32(x)