diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-30 12:56:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-30 12:56:58 -0400 |
| commit | 588eec2a8603ee8a8e2e913895767c4c02d523af (patch) | |
| tree | 6c51f6e969c5ef309d424b87a0295800baefa87a /arch/arm/include/asm/io.h | |
| parent | cde7f96109e4d367df51c8fc522acdcd10f2702e (diff) | |
| parent | 7ee52af455c2cec7b674d2159806f7e95da8e6a5 (diff) | |
| download | blackbird-obmc-uboot-588eec2a8603ee8a8e2e913895767c4c02d523af.tar.gz blackbird-obmc-uboot-588eec2a8603ee8a8e2e913895767c4c02d523af.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/include/asm/io.h')
| -rw-r--r-- | arch/arm/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index bfbe0a0988..75773bdbe0 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -46,7 +46,7 @@ static inline void sync(void) static inline void * map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) { - return (void *)paddr; + return (void *)((unsigned long)paddr); } /* @@ -59,7 +59,7 @@ 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); + return (phys_addr_t)((unsigned long)vaddr); } /* |
