diff options
| author | Stuart Menefy <stuart.menefy@st.com> | 2007-11-30 17:52:53 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:59 +0900 |
| commit | d02b08f6e8b184ffef349e395210a5e82ff4f4bc (patch) | |
| tree | 1dbec9fe6d2315a95855ce5a91f92a2a1fbf5a22 /include/asm-sh/io.h | |
| parent | cbaa118ecfd99fc5ed7adbd9c34a30e1c05e3c93 (diff) | |
sh: Clean up places that make 29-bit physical assumptions.
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh/io.h')
| -rw-r--r-- | include/asm-sh/io.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h index a4e5f5573eee..94900c089519 100644 --- a/include/asm-sh/io.h +++ b/include/asm-sh/io.h @@ -273,23 +273,9 @@ extern void onchip_unmap(unsigned long vaddr); #if !defined(CONFIG_MMU) #define virt_to_phys(address) ((unsigned long)(address)) #define phys_to_virt(address) ((void *)(address)) -#elif defined(CONFIG_SUPERH64) +#else #define virt_to_phys(address) (__pa(address)) #define phys_to_virt(address) (__va(address)) -#else -/* - * Change virtual addresses to physical addresses and vv. - * These are trivial on the 1:1 Linux/SuperH mapping - */ -static inline unsigned long virt_to_phys(volatile void *address) -{ - return PHYSADDR(address); -} - -static inline void *phys_to_virt(unsigned long address) -{ - return (void *)P1SEGADDR(address); -} #endif /* |