diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-02-23 15:42:44 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-02-23 15:42:44 -0600 |
| commit | 741a1ea97335c88747a2de6677b92458d6ada00b (patch) | |
| tree | 83ee5d31a46d2f1132eb0c968874b765704bd7df /include/asm-mips/io.h | |
| parent | 7511835b29f2074ebfa8ea794f0303ec8e49542b (diff) | |
| parent | 32688e572ff96715b41420e9a7f280db6c399b65 (diff) | |
| download | u-boot-imx-741a1ea97335c88747a2de6677b92458d6ada00b.zip u-boot-imx-741a1ea97335c88747a2de6677b92458d6ada00b.tar.gz u-boot-imx-741a1ea97335c88747a2de6677b92458d6ada00b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/asm-mips/io.h')
| -rw-r--r-- | include/asm-mips/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ static inline void set_io_port_base(unsigned long base) * 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); } |