diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 00:54:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 00:54:37 -0400 |
commit | 6a302358d87fedaf7bda12b8e909265ebf1ce674 (patch) | |
tree | 9bb5d79d812d531ae7031fe4aecf18151e41f716 /include/asm-sh/io.h | |
parent | 8e268f333012c62fc6a5a10e1e2a19c1c389853e (diff) | |
parent | e06c4e5775b1efc4e476f2430439e45867775f5f (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: Fix fs.h removal from mm.h regressions.
sh: fix get_wchan() for SH kernels without framepointers
sh: arch/sh/boot - fix shell usage
rtc: rtc-sh: Correct sh_rtc_set_time() for some SH-3 parts.
sh: remove support for sh7300 and solution engine 7300
sh: Add sh to the CC_OPTIMIZE_FOR_SIZE dependencies.
sh: Kill off virt_to_bus()/bus_to_virt().
sh: sh-sci - fix SH7708 support
sh: Restrict DSP support to specific CPUs.
sh: Silence sq compile warning on sh4 nommu.
sh: Kill the rest of the SE73180 cruft.
sh: remove support for sh73180 and solution engine 73180
sh: remove old broken pint code
sh: Reclaim beginning of P3 space for vmalloc area.
sh: Fix Dreamcast DMA issues.
sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4.
Diffstat (limited to 'include/asm-sh/io.h')
-rw-r--r-- | include/asm-sh/io.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h index aa80930ce8e4..e6a1877dcb20 100644 --- a/include/asm-sh/io.h +++ b/include/asm-sh/io.h | |||
@@ -241,10 +241,6 @@ static inline void *phys_to_virt(unsigned long address) | |||
241 | #define virt_to_phys(address) ((unsigned long)(address)) | 241 | #define virt_to_phys(address) ((unsigned long)(address)) |
242 | #endif | 242 | #endif |
243 | 243 | ||
244 | #define virt_to_bus virt_to_phys | ||
245 | #define bus_to_virt phys_to_virt | ||
246 | #define page_to_bus page_to_phys | ||
247 | |||
248 | /* | 244 | /* |
249 | * readX/writeX() are used to access memory mapped devices. On some | 245 | * readX/writeX() are used to access memory mapped devices. On some |
250 | * architectures the memory mapped IO stuff needs to be accessed | 246 | * architectures the memory mapped IO stuff needs to be accessed |