| commit | 8188df48f7b82d584634ceff187b4ea08260f747 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Sun Feb 22 22:51:32 2009 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Sun Feb 22 22:51:32 2009 +0100 |
| tree | f9dbc5ccf72b7003104e6b61e09a82153cbb69aa | |
| parent | f12ab9d66215ee0fd032b44bc83e7343caf43361 [diff] | |
| parent | a37dd0d82728b8d69d85fccf4144e43cef8856d7 [diff] |
Merge branch 'master' of /home/wd/git/u-boot/custodians
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index 031186d..025012a 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h
@@ -118,7 +118,7 @@ * Change virtual addresses to physical addresses and vv. * These are trivial on the 1:1 Linux/MIPS mapping */ -extern inline phys_addr_t virt_to_phys(void * address) +extern inline phys_addr_t virt_to_phys(volatile void * address) { return CPHYSADDR(address); }