Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / m32r / kernel / io_mappi3.c

diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/kernel/io_mappi3.c
index c80bde657854cbf62a7d5bc9adae8101e6857b6c..6716ffea769a17b9d4423acfd79ccbea81c060ca 100644 (file)
--- a/arch/m32r/kernel/io_mappi3.c
+++ b/arch/m32r/kernel/io_mappi3.c
@@ -36,9 +36,6 @@ static inline void *_port2addr(unsigned long port)
        return (void *)(port + NONCACHE_OFFSET);
 }
 
-#define LAN_IOSTART    0x300
-#define LAN_IOEND      0x320
-
 #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
 static inline void *__port2addr_ata(unsigned long port)
 {
@@ -59,9 +56,11 @@ static inline void *__port2addr_ata(unsigned long port)
 }
 #endif
 
+#define LAN_IOSTART    0xa0000300
+#define LAN_IOEND      0xa0000320
 static inline void *_port2addr_ne(unsigned long port)
 {
-       return (void *)(port + NONCACHE_OFFSET + 0x10000000);
+       return (void *)(port + 0x10000000);
 }
 
 static inline void *_port2addr_usb(unsigned long port)