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

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

diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h
index 33c454a4373155dc25bb372830007a60aea0d4a0..531f420336cd447b6781f6a27ae3e9965c010e5c 100644 (file)
--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
@@ -28,6 +28,10 @@
 
 #include <asm/byteorder.h>
 
+#ifndef _IO_BASE
+#define _IO_BASE 0
+#endif
+
 #define __raw_readb(addr) (*(volatile u8 *)(addr))
 #define __raw_readw(addr) (*(volatile u16 *)(addr))
 #define __raw_readl(addr) (*(volatile u32 *)(addr))
@@ -232,8 +236,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)
@@ -253,4 +255,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                         /* __ASM_M68K_IO_H__ */