X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fm32r%2Fkernel%2Fio_mappi.c;h=31396789ab1baad24a23a4aeec84efa913a8a4d8;hb=225ec70a8cf5086a70d755e394c56186a30053d3;hp=78033165fb5c7ecb489bb35a442654f8ce415ccc;hpb=603fff54420a0ccc4c3b48bfef43896fb4e33161;p=powerpc.git

diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/kernel/io_mappi.c
index 78033165fb..31396789ab 100644
--- a/arch/m32r/kernel/io_mappi.c
+++ b/arch/m32r/kernel/io_mappi.c
@@ -7,7 +7,6 @@
  *                           Hitoshi Yamamoto
  */
 
-#include <linux/config.h>
 #include <asm/m32r.h>
 #include <asm/page.h>
 #include <asm/io.h>
@@ -31,7 +30,7 @@ extern void pcc_iowrite(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);
 }
 
 static inline void *_port2addr_ne(unsigned long port)