summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMats O Jansson <maja@cvs.openbsd.org>1997-09-12 09:18:15 +0000
committerMats O Jansson <maja@cvs.openbsd.org>1997-09-12 09:18:15 +0000
commit330a82eb79f3450c17981e71298fc1459e26ea15 (patch)
tree23c2008621a97bf6c211a1787f506b34c430d092 /sys/arch
parentd220b73a4ed69c2d9e64898ce1a4a33432df3af6 (diff)
Sync with NetBSD 970827. -moj
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/vax/conf/GENERIC6
-rw-r--r--sys/arch/vax/conf/files.vax4
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 285d508aa35..5452243007e 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,5 +1,5 @@
-# $OpenBSD: GENERIC,v 1.10 1997/09/10 07:34:18 maja Exp $
-# $NetBSD: GENERIC,v 1.20 1997/01/12 12:38:56 ragge Exp $
+# $OpenBSD: GENERIC,v 1.11 1997/09/12 09:18:12 maja Exp $
+# $NetBSD: GENERIC,v 1.24 1997/08/23 19:19:31 ragge Exp $
#
# GENERIC VAX configuration file; all supported devices.
#
@@ -32,6 +32,8 @@ option DDB
option KTRACE
#option DIAGNOSTIC
+#options SCSIVERBOSE # Verbose SCSI errors
+
# Network support
#option GATEWAY
option INET
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index 47a01819acc..fa4c724be54 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: files.vax,v 1.6 1997/09/10 07:34:21 maja Exp $
+# $OpenBSD: files.vax,v 1.7 1997/09/12 09:18:14 maja Exp $
# $NetBSD: files.vax,v 1.27 1997/03/15 18:11:09 is Exp $
#
# new style config file for vax architecture
@@ -307,7 +307,7 @@ file arch/vax/vax/machdep.c
file arch/vax/vax/ka750.c vax750
file arch/vax/vax/ctu.c vax750
file arch/vax/vax/ka780.c vax780
-#file arch/vax/vax/cfl.c vax780
+file arch/vax/vax/cfl.c vax780
file arch/vax/vax/ka820.c vax8200
file arch/vax/vax/ka860.c vax8600
file arch/vax/vax/crl.c vax8600