---

yaml --- r: 33909 b: refs/heads/master c: f01f0f0 h: refs/heads/master i: 33907: c166e7c v: v3
git-mirror · Sep 13, 2006 · 36f5229 · 36f5229
1 parent 0aebbfb
commit 36f5229
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 651c923a4446dc5aee385d81c2436d6edf8c9a0c
+refs/heads/master: f01f0f052d1255dcdcf11d4872c4bca95e46b36c
diff --git a/trunk/include/asm-i386/Kbuild b/trunk/include/asm-i386/Kbuild
@@ -1,5 +1,5 @@
 include include/asm-generic/Kbuild.asm
 
-header-y += boot.h debugreg.h ldt.h setup.h ucontext.h
+header-y += boot.h debugreg.h ldt.h ucontext.h
 
-unifdef-y += mtrr.h vm86.h
+unifdef-y += mtrr.h setup.h vm86.h
diff --git a/trunk/include/asm-i386/setup.h b/trunk/include/asm-i386/setup.h
@@ -6,13 +6,15 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
+#ifdef __KERNEL__
 #include <linux/pfn.h>
 
 /*
  * Reserved space for vmalloc and iomap - defined in asm/page.h
  */
 #define MAXMEM_PFN	PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN	(1 << 20)
+#endif
 
 #define PARAM_SIZE 4096
 #define COMMAND_LINE_SIZE 256