summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-05-22 08:25:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-05-22 08:25:30 +0000
commit0ff8b72edecb06bbfece1b85d73c2873d04a0eb3 (patch)
treefc576ac00bc189706db675f2edb43be36c434650
parent1cd1364711804b7f51d5723d6c1ac771b0119fcc (diff)
magma in both these
-rw-r--r--sys/arch/sparc/conf/GENERIC3
-rw-r--r--sys/arch/sparc/conf/GENERIC_SCSI37
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 0f61c45c7dd..c07d623e168 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.27 1998/05/20 19:29:14 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.28 1998/05/22 08:25:27 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
# Machine architecture; required by config(8)
@@ -94,6 +94,7 @@ zs1 at obio0 addr 0xf0000000 level 12 flags 0x103 # sun4/200 and sun4/300
zs1 at obio0 addr 0x00000000 level 12 flags 0x103 # sun4/100
zs2 at obio0 addr 0xe0000000 level 12 flags 0x103 # sun4/300
+# Magma serial/parallel port devices
magma* at sbus? slot ? offset ? # magma serial cards
mtty* at magma?
mbpp* at magma?
diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3
index 6cf327caf87..ad345f77267 100644
--- a/sys/arch/sparc/conf/GENERIC_SCSI3
+++ b/sys/arch/sparc/conf/GENERIC_SCSI3
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC_SCSI3,v 1.20 1998/04/30 06:12:55 jason Exp $
+# $OpenBSD: GENERIC_SCSI3,v 1.21 1998/05/22 08:25:29 deraadt Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -90,6 +90,11 @@ zs1 at obio0 addr 0xf0000000 level 12 flags 0x103 # sun4/200 and sun4/300
zs1 at obio0 addr 0x00000000 level 12 flags 0x103 # sun4/100
zs2 at obio0 addr 0xe0000000 level 12 flags 0x103 # sun4/300
+# Magma serial/parallel port devices
+magma* at sbus? slot ? offset ? # magma serial cards
+mtty* at magma?
+mbpp* at magma?
+
#
# Note the flags on the esp entries below, that work around
# deficiencies in the current driver: