aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/elf.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2008-03-09 12:35:00 -0700
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:58 +0200
commite40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9 (patch)
treeefdb83368f0818ff51555bdd70f6ec2c6b439318 /include/asm-x86/elf.h
parent537d916066f66de18dbca79adf82933cd12d2a36 (diff)
x86: cleanup duplicate includes
Signed-off-by: Joe Perches <joe@perches.com> arch/x86/kernel/reboot.c | 1 - include/asm-x86/elf.h | 5 ++--- include/asm-x86/posix_types.h | 8 +------- include/asm-x86/processor.h | 3 +-- include/asm-x86/unistd.h | 8 +------- 5 files changed, 5 insertions(+), 20 deletions(-) Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/elf.h')
-rw-r--r--include/asm-x86/elf.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h
index fb62f9941e3..77325646e2f 100644
--- a/include/asm-x86/elf.h
+++ b/include/asm-x86/elf.h
@@ -82,8 +82,9 @@ extern unsigned int vdso_enabled;
#define elf_check_arch_ia32(x) \
(((x)->e_machine == EM_386) || ((x)->e_machine == EM_486))
-#ifdef CONFIG_X86_32
#include <asm/processor.h>
+
+#ifdef CONFIG_X86_32
#include <asm/system.h> /* for savesegment */
#include <asm/desc.h>
@@ -135,8 +136,6 @@ extern unsigned int vdso_enabled;
#else /* CONFIG_X86_32 */
-#include <asm/processor.h>
-
/*
* This is used to ensure we don't load something for the wrong architecture.
*/