diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 10:56:34 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 10:56:34 -0800 |
commit | 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 (patch) | |
tree | cc380ac53a720a905232463cd8fed9cb27875723 /arch/mips/sgi-ip32/crime.c | |
parent | cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f (diff) | |
parent | aec8b7557cf0fc4dac059112328b5aa89271c77e (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/sgi-ip32/crime.c')
-rw-r--r-- | arch/mips/sgi-ip32/crime.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c index eb3a16a04fe..41b5eca1148 100644 --- a/arch/mips/sgi-ip32/crime.c +++ b/arch/mips/sgi-ip32/crime.c @@ -10,6 +10,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/module.h> #include <asm/bootinfo.h> #include <asm/io.h> #include <asm/mipsregs.h> @@ -18,8 +19,10 @@ #include <asm/ip32/crime.h> #include <asm/ip32/mace.h> -struct sgi_crime *crime; -struct sgi_mace *mace; +struct sgi_crime __iomem *crime; +struct sgi_mace __iomem *mace; + +EXPORT_SYMBOL_GPL(mace); void __init crime_init(void) { |