git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-parisc
/
io.h
diff --git
a/include/asm-parisc/io.h
b/include/asm-parisc/io.h
index
b9eb245
..
c1963ce
100644
(file)
--- a/
include/asm-parisc/io.h
+++ b/
include/asm-parisc/io.h
@@
-134,7
+134,7
@@
extern inline void __iomem * ioremap(unsigned long offset, unsigned long size)
}
#define ioremap_nocache(off, sz) ioremap((off), (sz))
-extern void iounmap(void __iomem *addr);
+extern void iounmap(
const volatile
void __iomem *addr);
static inline unsigned char __raw_readb(const volatile void __iomem *addr)
{