summaryrefslogtreecommitdiff
path: root/sys/arch/sgi/xbow/xbow.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-11-07 18:56:56 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-11-07 18:56:56 +0000
commitfdb0a025f1da65e2f076e99c304c7fd4796b343a (patch)
treef992b32e1fd78b65502faf9a45ab3d71226c6c7d /sys/arch/sgi/xbow/xbow.c
parent05ea5cfbae200015db0fc343bfb527229a3c9338 (diff)
Replace option TGT_ORIGIN200 and TGT_ORIGIN2000 with a single option,
TGT_ORIGIN, which enables support for all IP27 and IP35 systems. The original two options have always been used together, and go back to when pefo thought supporting multiple nodes would be significant work. Since an Origin 200 can be a dual-node system, making a distinction between single node and multiple node systems is a moot point anyway. Be sure to rerun config(8) before rebuilding a kernel.
Diffstat (limited to 'sys/arch/sgi/xbow/xbow.c')
-rw-r--r--sys/arch/sgi/xbow/xbow.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sgi/xbow/xbow.c b/sys/arch/sgi/xbow/xbow.c
index a184dab70f0..9b5a7c401fa 100644
--- a/sys/arch/sgi/xbow/xbow.c
+++ b/sys/arch/sgi/xbow/xbow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xbow.c,v 1.23 2009/11/07 14:49:02 miod Exp $ */
+/* $OpenBSD: xbow.c,v 1.24 2009/11/07 18:56:55 miod Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -298,7 +298,7 @@ xbowattach(struct device *parent, struct device *self, void *aux)
case SGI_OCTANE:
klcfg.probe_order = xbow_probe_octane;
break;
-#if defined(TGT_ORIGIN200) || defined(TGT_ORIGIN2000)
+#ifdef TGT_ORIGIN
default:
/*
* Default value for the interrupt register.
@@ -394,7 +394,7 @@ xbow_attach_widget(struct device *self, int16_t nasid, int widget,
return 0;
}
-#if defined(TGT_ORIGIN200) || defined(TGT_ORIGIN2000)
+#ifdef TGT_ORIGIN
/*
* These two functions try to figure out the configuration of the XBow