Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / asm-mips / ip32 / mace.h

diff --git a/include/asm-mips/ip32/mace.h b/include/asm-mips/ip32/mace.h
index e514efe44c0670ac149eaebcd034ee1a0dde1020..990082c81f3957f04abab2b5f240647216bf4742 100644 (file)
--- a/include/asm-mips/ip32/mace.h
+++ b/include/asm-mips/ip32/mace.h
@@ -363,6 +363,6 @@ struct sgi_mace {
        char _pad6[0x80000 - sizeof(struct mace_isa)];
 };
 
-extern struct sgi_mace *mace;
+extern struct sgi_mace __iomem *mace;
 
 #endif /* __ASM_MACE_H__ */