From 5df983e65f89d09e226903c065bd8d5a09a937e9 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Fri, 13 Feb 2009 12:52:44 -0600 Subject: [PATCH] --- yaml --- r: 136857 b: refs/heads/master c: bf33a70a73876b163d62612e9567cbac6604ba7e h: refs/heads/master i: 136855: 9f58e563d0e97cb38827a37de17f02acef4d193d v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/io.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 279a298a667f..5063cbd1b570 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: beb6943d8df7ce9278282101af4e0f6f7b648451 +refs/heads/master: bf33a70a73876b163d62612e9567cbac6604ba7e diff --git a/trunk/arch/x86/include/asm/io.h b/trunk/arch/x86/include/asm/io.h index e5a2ab44cd5c..4f8e820cf38f 100644 --- a/trunk/arch/x86/include/asm/io.h +++ b/trunk/arch/x86/include/asm/io.h @@ -125,7 +125,7 @@ static inline void *phys_to_virt(phys_addr_t address) /* * ISA I/O bus memory addresses are 1:1 with the physical address. */ -#define isa_virt_to_bus virt_to_phys +#define isa_virt_to_bus (unsigned long)virt_to_phys #define isa_page_to_bus page_to_phys #define isa_bus_to_virt phys_to_virt