---

yaml --- r: 137021 b: refs/heads/master c: 5f403fa h: refs/heads/master i: 137019: 8030fad v: v3
git-mirror · Feb 28, 2009 · 0d69370 · 0d69370
1 parent 539c5f3
commit 0d69370
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ae38daf25204b7c3725e053052f77469eff62cf
+refs/heads/master: 5f403fa9de5b3bb1309ec5f72b1e52e5b51321d4
diff --git a/trunk/arch/x86/include/asm/fixmap_64.h b/trunk/arch/x86/include/asm/fixmap_64.h
@@ -16,7 +16,9 @@
 #include <asm/apicdef.h>
 #include <asm/page.h>
 #include <asm/vsyscall.h>
+#ifdef CONFIG_EFI
 #include <asm/efi.h>
+#endif
 
 /*
  * Here we define all the compile-time 'special' virtual
@@ -47,9 +49,11 @@ enum fixed_addresses {
 	FIX_IO_APIC_BASE_0,
 	FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
 #endif
+#ifdef CONFIG_EFI
 	FIX_EFI_IO_MAP_LAST_PAGE,
 	FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
 				  + MAX_EFI_IO_PAGES - 1,
+#endif
 #ifdef CONFIG_PARAVIRT
 	FIX_PARAVIRT_BOOTMAP,
 #endif