commit 46ea178b7a5162405bf70954d769165cf2161309
author Hirokazu Takata <takata@linux-m32r.org> Fri Jan 06 00:18:43 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Jan 06 08:33:44 2006 -0800
tree d757c796068a38ffa8c2b793233805c9b0120cde
parent 1b5b776aa5730cbda9cba84ba0f8ccd53a775797

[PATCH] m32r: Update _port2addr to use NONCACHE_OFFSET

Modify _port2addr*() routines in arch/m32r/kernel/io_*.c to use
NONCACHE_OFFSET instead of hard-coding of a constant address.

This modification is also required to support an M3A-ZA36 FPGA eva board in
case an MMU-less synthesizable m32r core is used.

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>

include/asm-m32r/m32r.h

diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h
index f9bb48ac..b133ca6 100644
--- a/include/asm-m32r/m32r.h
+++ b/include/asm-m32r/m32r.h
@@ -126,7 +126,7 @@
 
 #include <asm/page.h>
 #ifdef CONFIG_MMU
-#define NONCACHE_OFFSET  __PAGE_OFFSET+0x20000000
+#define NONCACHE_OFFSET  (__PAGE_OFFSET + 0x20000000)
 #else
 #define NONCACHE_OFFSET  __PAGE_OFFSET
 #endif /* CONFIG_MMU */