projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
include
/
asm
/
elf.h
diff --git
a/arch/x86/include/asm/elf.h
b/arch/x86/include/asm/elf.h
index 1e40634591a4c48c01aefc2f97a0244227a0fdde..5939f44fe0c0dfdce7fc8a88452e03871be35882 100644
(file)
--- a/
arch/x86/include/asm/elf.h
+++ b/
arch/x86/include/asm/elf.h
@@
-84,7
+84,6
@@
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/desc.h>