aboutsummaryrefslogtreecommitdiff
path: root/include/asm-sparc/memreg.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-21 04:38:01 -0500
committerLen Brown <len.brown@intel.com>2005-12-21 04:38:01 -0500
commitd8bcd8e41576809f276fa44be5012568296cce41 (patch)
treeec48438ed1a7b3d3794a0a4cc577d0bab69b7f03 /include/asm-sparc/memreg.h
parent5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 (diff)
parentb05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff)
Auto-update from upstream
Diffstat (limited to 'include/asm-sparc/memreg.h')
-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 c0498d3baf9..5fb95c828da 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) */