summaryrefslogtreecommitdiff
path: root/include/asm-x86/unistd.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2008-03-09 22:35:00 +0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 19:40:58 +0400
commite40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9 (patch)
treeefdb83368f0818ff51555bdd70f6ec2c6b439318 /include/asm-x86/unistd.h
parent537d916066f66de18dbca79adf82933cd12d2a36 (diff)
downloadlinux-e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9.tar.xz
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/unistd.h')
-rw-r--r--include/asm-x86/unistd.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-x86/unistd.h b/include/asm-x86/unistd.h
index 2a58ed3e51d8..effc7ad8e12f 100644
--- a/include/asm-x86/unistd.h
+++ b/include/asm-x86/unistd.h
@@ -1,11 +1,5 @@
#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-# include "unistd_32.h"
-# else
-# include "unistd_64.h"
-# endif
-#else
-# ifdef __i386__
+# if defined(CONFIG_X86_32) || defined(__i386__)
# include "unistd_32.h"
# else
# include "unistd_64.h"