aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips/ip32/crime.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-17 10:56:34 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-17 10:56:34 -0800
commit7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 (patch)
treecc380ac53a720a905232463cd8fed9cb27875723 /include/asm-mips/ip32/crime.h
parentx86: Fix silly typo in recent <asm/signal.h> fixes (diff)
parent[MIPS] Update defconfigs (diff)
downloadlinux-dev-7652aab77fbf6de8bcc69ee6a864270b0da6b3f6.tar.xz
linux-dev-7652aab77fbf6de8bcc69ee6a864270b0da6b3f6.zip
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/ip32/crime.h')
-rw-r--r--include/asm-mips/ip32/crime.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/ip32/crime.h b/include/asm-mips/ip32/crime.h
index 152879bae20f..a13702fafa85 100644
--- a/include/asm-mips/ip32/crime.h
+++ b/include/asm-mips/ip32/crime.h
@@ -154,7 +154,7 @@ struct sgi_crime {
#define CRIME_MEM_ERROR_ECC_REPL_MASK 0xffffffff
};
-extern struct sgi_crime *crime;
+extern struct sgi_crime __iomem *crime;
#define CRIME_HI_MEM_BASE 0x40000000 /* this is where whole 1G of RAM is mapped */