---

yaml --- r: 136857 b: refs/heads/master c: bf33a70 h: refs/heads/master i: 136855: 9f58e56 v: v3
git-mirror · Feb 13, 2009 · 5df983e · 5df983e
1 parent a6317db
commit 5df983e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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