git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream'
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
io_oaks32r.c
diff --git
a/arch/m32r/kernel/io_oaks32r.c
b/arch/m32r/kernel/io_oaks32r.c
index
9997ddd
..
910dd13
100644
(file)
--- a/
arch/m32r/kernel/io_oaks32r.c
+++ b/
arch/m32r/kernel/io_oaks32r.c
@@
-16,7
+16,7
@@
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)