summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-27 01:58:08 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-27 01:58:08 +0000
commit491acd850793819653244277144163706275eb7e (patch)
tree499f2c7138341b50794ca1e02a9a9010f38e658b
parent9a098b73825cd708f17e96b8de5c37319e29ee97 (diff)
Compile Origin bits only for Origin. Why are they in this file at
all ...
-rw-r--r--arch/mips64/kernel/setup.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips64/kernel/setup.c b/arch/mips64/kernel/setup.c
index 316ad7c29..32b8fe847 100644
--- a/arch/mips64/kernel/setup.c
+++ b/arch/mips64/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.8 2000/03/02 02:36:50 ralf Exp $
+/* $Id: setup.c,v 1.9 2000/03/14 01:39:27 ralf Exp $
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
@@ -37,6 +37,7 @@
#include <asm/system.h>
#ifdef CONFIG_SGI_IP27
+/* XXX Origin garbage has no business in this file */
#include <asm/sn/sn0/addrs.h>
#endif
@@ -102,7 +103,10 @@ extern char arcs_cmdline[CL_SIZE];
* mips_io_port_base is the begin of the address space to which x86 style
* I/O ports are mapped.
*/
+#ifdef CONFIG_SGI_IP27
+/* XXX Origin garbage has no business in this file */
unsigned long mips_io_port_base = IO_BASE;
+#endif
extern void ip22_setup(void);
extern void ip27_setup(void);