summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-05-10 12:44:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-05-10 12:44:27 +0000
commite02ead6ad4d47c7f65a8a5e82867652033ca134a (patch)
tree2567b1aaded57104c9c53541f170d767defcbd02 /sys/arch/i386
parent47c3c309dd7c4d72923ca8fd75915de82c7b911c (diff)
fpa fddi card
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/GENERICADP5
-rw-r--r--sys/arch/i386/conf/GENERICOTHER5
-rw-r--r--sys/arch/i386/conf/INSTADP5
-rw-r--r--sys/arch/i386/conf/INSTOTHER4
5 files changed, 14 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 719639b6df8..2e96e7732b1 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,5 +1,5 @@
-# $OpenBSD: GENERIC,v 1.12 1996/05/09 20:50:03 hvozda Exp $
-# $NetBSD: GENERIC,v 1.44 1996/04/25 20:14:13 scottr Exp $
+# $OpenBSD: GENERIC,v 1.13 1996/05/10 12:44:24 deraadt Exp $
+# $NetBSD: GENERIC,v 1.45 1996/05/07 00:59:53 thorpej Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -190,6 +190,7 @@ de* at pci? dev ? function ? # DC21X4X-based ethernet cards
ep* at pci? dev ? function ? # 3C590 ethernet cards
ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
+fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP
index dd52daa24cf..0bb6332b40a 100644
--- a/sys/arch/i386/conf/GENERICADP
+++ b/sys/arch/i386/conf/GENERICADP
@@ -1,5 +1,5 @@
-# $OpenBSD: GENERICADP,v 1.11 1996/05/09 20:50:04 hvozda Exp $
-# $NetBSD: GENERICADP,v 1.20 1996/04/25 20:14:16 scottr Exp $
+# $OpenBSD: GENERICADP,v 1.12 1996/05/10 12:44:25 deraadt Exp $
+# $NetBSD: GENERICADP,v 1.21 1996/05/07 00:59:59 thorpej Exp $
#
# GENERICADP -- everything that's currently supported, except non-
# Adaptec SCSI controllers.
@@ -176,6 +176,7 @@ de* at pci? dev ? function ? # DC21X4X-based ethernet cards
ep* at pci? dev ? function ? # 3C590 ethernet cards
ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
+fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER
index 3eed6f65845..f56dbae84c8 100644
--- a/sys/arch/i386/conf/GENERICOTHER
+++ b/sys/arch/i386/conf/GENERICOTHER
@@ -1,5 +1,5 @@
-# $OpenBSD: GENERICOTHER,v 1.9 1996/05/09 20:50:04 hvozda Exp $
-# $NetBSD: GENERICOTHER,v 1.19 1996/04/25 20:14:21 scottr Exp $
+# $OpenBSD: GENERICOTHER,v 1.10 1996/05/10 12:44:25 deraadt Exp $
+# $NetBSD: GENERICOTHER,v 1.20 1996/05/07 01:00:05 thorpej Exp $
#
# GENERICOTHER -- everything that's currently supported, except
# Adaptec SCSI controllers.
@@ -180,6 +180,7 @@ de* at pci? dev ? function ? # DC21X4X-based ethernet cards
ep* at pci? dev ? function ? # 3C590 ethernet cards
ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
+fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INSTADP
index e7b547b30ec..233272bbbf4 100644
--- a/sys/arch/i386/conf/INSTADP
+++ b/sys/arch/i386/conf/INSTADP
@@ -1,5 +1,5 @@
-# $OpenBSD: INSTADP,v 1.8 1996/05/09 20:50:03 hvozda Exp $
-# $NetBSD: INSTADP,v 1.14 1996/04/25 20:14:23 scottr Exp $
+# $OpenBSD: INSTADP,v 1.9 1996/05/10 12:44:26 deraadt Exp $
+# $NetBSD: INSTADP,v 1.15 1996/05/07 01:00:12 thorpej Exp $
#
# INSTADP -- like GENERICADP. This supports only Adaptec SCSI
# adapters. This kernel is GENERICADP with lines
@@ -136,6 +136,7 @@ de* at pci? dev ? function ? # DC21X4X-based ethernet cards
ep* at pci? dev ? function ? # 3C590 ethernet cards
ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
+fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards
pseudo-device loop 1 # network loopback
pseudo-device sl 2 # CSLIP
diff --git a/sys/arch/i386/conf/INSTOTHER b/sys/arch/i386/conf/INSTOTHER
index fc28024dbb7..73a18f539d2 100644
--- a/sys/arch/i386/conf/INSTOTHER
+++ b/sys/arch/i386/conf/INSTOTHER
@@ -1,5 +1,5 @@
-# $OpenBSD: INSTOTHER,v 1.6 1996/05/09 20:50:02 hvozda Exp $
-# $NetBSD: INSTOTHER,v 1.13 1996/04/25 20:14:26 scottr Exp $
+# $OpenBSD: INSTOTHER,v 1.7 1996/05/10 12:44:26 deraadt Exp $
+# $NetBSD: INSTOTHER,v 1.14 1996/05/07 01:00:21 thorpej Exp $
#
# INSTOTHER -- like GENERICOTHER. This supports only non-Adaptec SCSI
# adapters. This kernel is GENERICOTHER with lines