summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2005-12-06 11:56:39 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-15 19:01:29 +0100
commita32972965e23471f0762a1136f80990ebf72406a (patch)
tree47064f7ccb8f49a671c3689c34d562a6ca164f6c /include
parent[PATCH] sparc: NULL noise removal (ebus.c) (diff)
downloadlinux-a32972965e23471f0762a1136f80990ebf72406a.tar.xz
linux-a32972965e23471f0762a1136f80990ebf72406a.zip
[PATCH] sun4c_memerr_reg __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc/memreg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/memreg.h b/include/asm-sparc/memreg.h
index c0498d3baf93..5fb95c828da6 100644
--- a/include/asm-sparc/memreg.h
+++ b/include/asm-sparc/memreg.h
@@ -36,7 +36,7 @@
/* Memory parity error register with associated bit constants. */
#ifndef __ASSEMBLY__
-extern __volatile__ unsigned long *sun4c_memerr_reg;
+extern __volatile__ unsigned long __iomem *sun4c_memerr_reg;
#endif
#define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */