diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-31 13:27:22 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-31 13:27:22 -0500 |
| commit | eea60caef610c7a6c58c0de9c80ae1e438e01301 (patch) | |
| tree | 25e19289bba003fe085e589430d0d981fd6b73a7 /include/asm-sparc/memreg.h | |
| parent | da8543ef125afc7bba4da526b61a1ae07dc25109 (diff) | |
| parent | 82c9df820112c6286a8e8fbe482e94b65b49062c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-sparc/memreg.h')
| -rw-r--r-- | include/asm-sparc/memreg.h | 2 |
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 @@ | |||
| 36 | 36 | ||
| 37 | /* Memory parity error register with associated bit constants. */ | 37 | /* Memory parity error register with associated bit constants. */ |
| 38 | #ifndef __ASSEMBLY__ | 38 | #ifndef __ASSEMBLY__ |
| 39 | extern __volatile__ unsigned long *sun4c_memerr_reg; | 39 | extern __volatile__ unsigned long __iomem *sun4c_memerr_reg; |
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | #define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */ | 42 | #define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */ |