diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-08-07 15:12:39 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 18:50:19 +0200 |
| commit | b0fbaa6b5976962434349849673b9ff63631b6d4 (patch) | |
| tree | 4bc19d6c321643be89684102a5fdae567702d02d /include/asm-x86 | |
| parent | 9b0094f7f289d752868aae1a3984517d712cbb22 (diff) | |
| download | kernel_samsung_tuna-b0fbaa6b5976962434349849673b9ff63631b6d4.zip kernel_samsung_tuna-b0fbaa6b5976962434349849673b9ff63631b6d4.tar.gz kernel_samsung_tuna-b0fbaa6b5976962434349849673b9ff63631b6d4.tar.bz2 | |
EFI, x86: fix function prototype
Fix function prototype in header file to match source code:
linux-next-20080807/arch/x86/kernel/efi_64.c:100:14: error: symbol 'efi_ioremap' redeclared with different type (originally declared at include2/asm/efi.h:89) - different address spaces
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h index 7ed2bd7..d4f2b0a 100644 --- a/include/asm-x86/efi.h +++ b/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 */ |