diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /include/asm-x86/efi.h | |
| parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | op-kernel-dev-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip op-kernel-dev-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.gz | |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'include/asm-x86/efi.h')
| -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 */ |
