summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-12-17 16:43:18 +0100
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-12-17 16:43:18 +0100
commit92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (patch)
tree39728c6a5141864d4728f83bca0f61b35bf6b28c /include
parentaced78d852d0b009e8aaa1445af8cb40861ee549 (diff)
downloadu-boot-imx-92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb.zip
u-boot-imx-92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb.tar.gz
u-boot-imx-92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb.tar.bz2
avr32: Remove second definition of virt_to_phys()
The second definition introduced by 65e43a1063 conflicts with the existing one. Also, convert the existing definition to use phys_addr_t. The volatile qualifier is still needed due to brain damage elsewhere. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'include')
-rw-r--r--include/asm-avr32/io.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h
index d22cd35..50967ac 100644
--- a/include/asm-avr32/io.h
+++ b/include/asm-avr32/io.h
@@ -76,12 +76,12 @@ extern void __readwrite_bug(const char *fn);
#include <asm/addrspace.h>
/* virt_to_phys will only work when address is in P1 or P2 */
-static __inline__ unsigned long virt_to_phys(volatile void *address)
+static inline phys_addr_t virt_to_phys(volatile void *address)
{
return PHYSADDR(address);
}
-static __inline__ void * phys_to_virt(unsigned long address)
+static inline void *phys_to_virt(phys_addr_t address)
{
return (void *)P1SEGADDR(address);
}
@@ -125,9 +125,4 @@ static inline void unmap_physmem(void *vaddr, unsigned long len)
}
-static inline phys_addr_t virt_to_phys(void * vaddr)
-{
- return (phys_addr_t)(vaddr);
-}
-
#endif /* __ASM_AVR32_IO_H */