summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-01-22 11:11:09 +0100
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-01-22 11:11:09 +0100
commit4d0b54685c5c656023b826089ef8cc0ea1c5cd9e (patch)
treedfc822a632f14cdb830784e00c7a253bbb69a75a /include
parent72d15e705bc3983884105cb7755c7ba80e74a0a5 (diff)
parent92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff)
downloadu-boot-imx-4d0b54685c5c656023b826089ef8cc0ea1c5cd9e.zip
u-boot-imx-4d0b54685c5c656023b826089ef8cc0ea1c5cd9e.tar.gz
u-boot-imx-4d0b54685c5c656023b826089ef8cc0ea1c5cd9e.tar.bz2
Merge branch 'fixes'
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 */