summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-05-10 21:30:10 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-05-10 21:30:10 +0000
commit5285558185108451ee0e949708f83cd6a1787596 (patch)
tree327cd1d1304aa40cc5bde9899ea3a40c3c423eab
parent368d4e11cd0b0c65197e86d4dea8df5d8b17a9b0 (diff)
Fix impact(4) header file generation to correctly output NIMPACT_GIO on
IP22 kernels. Oops.
-rw-r--r--sys/arch/sgi/conf/files.sgi6
-rw-r--r--sys/arch/sgi/gio/files.gio5
-rw-r--r--sys/arch/sgi/xbow/files.xbow5
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index d9ce8fd9872..0cdc4d94ac0 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sgi,v 1.49 2012/04/18 17:28:24 miod Exp $
+# $OpenBSD: files.sgi,v 1.50 2012/05/10 21:30:05 miod Exp $
#
# maxpartitions must be first item in files.${ARCH}
#
@@ -61,7 +61,9 @@ attach clock at mainbus
# Impact/ImpactSR common code
device impact: wsemuldisplaydev, rasops32
-file arch/sgi/dev/impact.c impact needs-flag
+file arch/sgi/dev/impact.c impact |
+ impact_gio |
+ impact_xbow needs-flag
#
# IP20/22/24 specific devices
diff --git a/sys/arch/sgi/gio/files.gio b/sys/arch/sgi/gio/files.gio
index e915bdd4cb8..8e14a55aed5 100644
--- a/sys/arch/sgi/gio/files.gio
+++ b/sys/arch/sgi/gio/files.gio
@@ -1,4 +1,4 @@
-# $OpenBSD: files.gio,v 1.3 2012/04/18 17:28:24 miod Exp $
+# $OpenBSD: files.gio,v 1.4 2012/05/10 21:30:09 miod Exp $
# $NetBSD: files.gio,v 1.11 2009/02/12 06:33:57 rumble Exp $
device gio {[slot = -1], [addr = -1]}
@@ -27,8 +27,7 @@ file arch/sgi/gio/light.c light needs-flag
# Impact graphics
attach impact at gio with impact_gio
-file arch/sgi/gio/impact_gio.c impact &
- impact_gio needs-flag
+file arch/sgi/gio/impact_gio.c impact_gio
# PCI cards glued to the GIO bus
device giopci: pcibus
diff --git a/sys/arch/sgi/xbow/files.xbow b/sys/arch/sgi/xbow/files.xbow
index 111c6c398a9..a58bd3f16ee 100644
--- a/sys/arch/sgi/xbow/files.xbow
+++ b/sys/arch/sgi/xbow/files.xbow
@@ -1,4 +1,4 @@
-# $OpenBSD: files.xbow,v 1.8 2012/04/18 17:28:24 miod Exp $
+# $OpenBSD: files.xbow,v 1.9 2012/05/10 21:30:09 miod Exp $
# IP30 and IP27 planar XBow bus
define xbow {[widget = -1], [vendor = -1], [product = -1]}
@@ -25,5 +25,4 @@ file arch/sgi/xbow/odyssey.c odyssey needs-flag
# ImpactSR graphics
attach impact at xbow with impact_xbow
-file arch/sgi/xbow/impact_xbow.c impact &
- impact_xbow needs-flag
+file arch/sgi/xbow/impact_xbow.c impact_xbow