From 8281b91b3eb3b9d4dfb1e95386c1b39ded5a2bda Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 7 Aug 2008 15:12:39 -0700 Subject: [PATCH] --- yaml --- r: 108170 b: refs/heads/master c: b0fbaa6b5976962434349849673b9ff63631b6d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/efi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 593c3ca6c063..f177be4e283f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b0094f7f289d752868aae1a3984517d712cbb22 +refs/heads/master: b0fbaa6b5976962434349849673b9ff63631b6d4 diff --git a/trunk/include/asm-x86/efi.h b/trunk/include/asm-x86/efi.h index 7ed2bd7a7f51..d4f2b0abe929 100644 --- a/trunk/include/asm-x86/efi.h +++ b/trunk/include/asm-x86/efi.h @@ -86,7 +86,7 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3, efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \ (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6)) -extern void *efi_ioremap(unsigned long addr, unsigned long size); +extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size); #endif /* CONFIG_X86_32 */