diff options
author | Joe Perches <joe@perches.com> | 2008-03-09 15:35:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:58 -0400 |
commit | e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9 (patch) | |
tree | efdb83368f0818ff51555bdd70f6ec2c6b439318 /include/asm-x86/elf.h | |
parent | 537d916066f66de18dbca79adf82933cd12d2a36 (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.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h index fb62f9941e38..77325646e2f4 100644 --- a/include/asm-x86/elf.h +++ b/include/asm-x86/elf.h | |||
@@ -82,8 +82,9 @@ extern unsigned int vdso_enabled; | |||
82 | #define elf_check_arch_ia32(x) \ | 82 | #define elf_check_arch_ia32(x) \ |
83 | (((x)->e_machine == EM_386) || ((x)->e_machine == EM_486)) | 83 | (((x)->e_machine == EM_386) || ((x)->e_machine == EM_486)) |
84 | 84 | ||
85 | #ifdef CONFIG_X86_32 | ||
86 | #include <asm/processor.h> | 85 | #include <asm/processor.h> |
86 | |||
87 | #ifdef CONFIG_X86_32 | ||
87 | #include <asm/system.h> /* for savesegment */ | 88 | #include <asm/system.h> /* for savesegment */ |
88 | #include <asm/desc.h> | 89 | #include <asm/desc.h> |
89 | 90 | ||
@@ -135,8 +136,6 @@ extern unsigned int vdso_enabled; | |||
135 | 136 | ||
136 | #else /* CONFIG_X86_32 */ | 137 | #else /* CONFIG_X86_32 */ |
137 | 138 | ||
138 | #include <asm/processor.h> | ||
139 | |||
140 | /* | 139 | /* |
141 | * This is used to ensure we don't load something for the wrong architecture. | 140 | * This is used to ensure we don't load something for the wrong architecture. |
142 | */ | 141 | */ |