diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-09 21:39:46 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-09 21:39:46 +0200 |
commit | 8fea51a4acb0c7da6fb375c9a708c50c0a1b66ad (patch) | |
tree | f6a3d36e35f8f4d1009c367417e918c210b0baf0 /arch/avr32/include/asm/arch-at32ap700x/addrspace.h | |
parent | 40e74c852b76accfe27d832f23ea3020352bc120 (diff) | |
parent | ec99d983418897b120409f71712d41c01a21bf7c (diff) | |
download | talos-obmc-uboot-8fea51a4acb0c7da6fb375c9a708c50c0a1b66ad.tar.gz talos-obmc-uboot-8fea51a4acb0c7da6fb375c9a708c50c0a1b66ad.zip |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/avr32/include/asm/arch-at32ap700x/addrspace.h')
-rw-r--r-- | arch/avr32/include/asm/arch-at32ap700x/addrspace.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/avr32/include/asm/arch-at32ap700x/addrspace.h b/arch/avr32/include/asm/arch-at32ap700x/addrspace.h index 409eee3536..4edc1bd701 100644 --- a/arch/avr32/include/asm/arch-at32ap700x/addrspace.h +++ b/arch/avr32/include/asm/arch-at32ap700x/addrspace.h @@ -75,10 +75,7 @@ static inline void * phys_to_virt(unsigned long address) static inline void * map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) { - if (flags == MAP_WRBACK) - return (void *)P1SEGADDR(paddr); - else - return (void *)P2SEGADDR(paddr); + return (void *)paddr; } #endif /* __ASM_AVR32_ADDRSPACE_H */ |