Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / include / asm-x86 / efi.h

diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h
index 8380131ca5429b15619e2eeff1f357a971a6d53a..9c68a1f098d8cb12af04bacd1564909b179aca61 100644 (file)
--- a/include/asm-x86/efi.h
+++ b/include/asm-x86/efi.h
@@ -35,8 +35,6 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...);
 
 #define efi_ioremap(addr, size)                        ioremap(addr, size)
 
-#define end_pfn_map                            max_low_pfn
-
 #else /* !CONFIG_X86_32 */
 
 #define MAX_EFI_IO_PAGES       100
@@ -95,6 +93,5 @@ extern void *efi_ioremap(unsigned long offset, unsigned long size);
 extern void efi_reserve_bootmem(void);
 extern void efi_call_phys_prelog(void);
 extern void efi_call_phys_epilog(void);
-extern void runtime_code_page_mkexec(void);
 
 #endif