Merge branch 'master' of git://git.denx.de/u-boot-ixp

[u-boot] / include / asm-i386 / io.h

diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h
index db4f4428178564e4dc77dc604afdb1f23c13563b..9b757d489e38091700085f93a76293065f66af97 100644 (file)
--- a/include/asm-i386/io.h
+++ b/include/asm-i386/io.h
@@ -210,8 +210,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)
@@ -231,4 +229,9 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)
 
 }
 
+static inline phys_addr_t virt_to_phys(void * vaddr)
+{
+       return (phys_addr_t)(vaddr);
+}
+
 #endif