diff options
| author | Hirokazu Takata <takata@linux-m32r.org> | 2005-10-31 00:00:04 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 02:37:16 +0100 |
| commit | 1343f776c51ecbed89eff5e174188523c731a8fe (patch) | |
| tree | 7a05a732894cc7911c36598238f6d948655c67a0 /arch/m32r/kernel/io_opsput.c | |
| parent | [PATCH] m32r: fix #if warnings (diff) | |
| download | linux-1343f776c51ecbed89eff5e174188523c731a8fe.tar.xz linux-1343f776c51ecbed89eff5e174188523c731a8fe.zip | |
[PATCH] m32r: NONCACHE_OFFSET in _port2addr
Change _port2addr() not to add NONCACHE_OFFSET. Adding NONCACHE_OFFSET
requires needless address adjusting by a driver using ioremap() like a
SMC91x driver.
Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m32r/kernel/io_opsput.c')
| -rw-r--r-- | arch/m32r/kernel/io_opsput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/kernel/io_opsput.c index e34951e8156f..5ac84b16faaf 100644 --- a/arch/m32r/kernel/io_opsput.c +++ b/arch/m32r/kernel/io_opsput.c @@ -36,7 +36,7 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int); static inline void *_port2addr(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET); + return (void *)(port | (NONCACHE_OFFSET)); } /* |