Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into...

[cascardo/linux.git] / arch / x86 / include / asm / io.h

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 2ea07f5..0cdbe6e 100644 (file)
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -314,8 +314,8 @@ BUILDIO(b, b, char)
 BUILDIO(w, w, short)
 BUILDIO(l, , int)
 
-extern void *xlate_dev_mem_ptr(unsigned long phys);
-extern void unxlate_dev_mem_ptr(unsigned long phys, void *addr);
+extern void *xlate_dev_mem_ptr(phys_addr_t phys);
+extern void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);
 
 extern int ioremap_change_attr(unsigned long vaddr, unsigned long size,
                                unsigned long prot_val);