diff -urN oldtree/arch/i386/kernel/setup.c newtree/arch/i386/kernel/setup.c
--- oldtree/arch/i386/kernel/setup.c	2006-08-02 07:14:12.000000000 -0700
+++ newtree/arch/i386/kernel/setup.c	2006-08-04 07:53:13.000000000 -0700
@@ -1453,7 +1453,7 @@
 /*
  * Make a e820 memory map
  */
-void __init efi_init_e820_map(void)
+static void __init efi_init_e820_map(void)
 {
 	efi_memory_desc_t *md;
 	unsigned long long start = 0;
@@ -1505,7 +1505,9 @@
 		}
 	}
 }
-#endif
+#else
+static void __init efi_init_e820_map(void) { }
+#endif /* CONFIG_EFI */
 
 /*
  * Determine if we were loaded by an EFI loader.  If so, then we have also been