---

yaml --- r: 99942 b: refs/heads/master c: 330ddd2 h: refs/heads/master v: v3
git-mirror · Jul 8, 2008 · d1f42bf · d1f42bf
1 parent e9a2652
commit d1f42bf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3442682a54a9f44047efe526869aa52bd74fe16e
+refs/heads/master: 330ddd20894f99a2b956ad59cf0cfdba188bde63
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
@@ -114,9 +114,6 @@
 #ifdef CONFIG_X86_64
 #include <asm/numa_64.h>
 #endif
-#ifdef CONFIG_X86_32
-#include <asm/highmem.h>
-#endif
 
 #ifndef CONFIG_DEBUG_BOOT_PARAMS
 struct boot_params __initdata boot_params;