summaryrefslogtreecommitdiff
path: root/include/asm-mips/io.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-11 22:48:09 +0200
committerWolfgang Denk <wd@denx.de>2008-06-11 22:48:09 +0200
commit1a5017601f6d17caedaa2bf069485d3e4155f1c0 (patch)
tree342b39d2a55eb4ebaf8b772bc8b74db4318d5eb7 /include/asm-mips/io.h
parentcdeb62e20d94005f2e80604fda03b498c3a6f704 (diff)
parent79b51ff8205f0354d5300570614c1d2db499679c (diff)
downloadu-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.zip
u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.gz
u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
Diffstat (limited to 'include/asm-mips/io.h')
-rw-r--r--include/asm-mips/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index 7137072..3a0f33f 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -120,7 +120,7 @@ static inline void set_io_port_base(unsigned long base)
*/
extern inline unsigned long virt_to_phys(volatile void * address)
{
- return PHYSADDR(address);
+ return CPHYSADDR(address);
}
extern inline void * phys_to_virt(unsigned long address)
@@ -133,7 +133,7 @@ extern inline void * phys_to_virt(unsigned long address)
*/
extern inline unsigned long virt_to_bus(volatile void * address)
{
- return PHYSADDR(address);
+ return CPHYSADDR(address);
}
extern inline void * bus_to_virt(unsigned long address)