summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-09-02 02:34:10 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-09-02 02:34:10 +0000
commit6f017ad05557f9ecda132d9917d215a8e5a45ef1 (patch)
treec856777dda4269c9da4aedf4ad03d639961a938d /sys/arch/i386/conf
parent9ccf5e2bdbada5ac64446209bed3d54d98820628 (diff)
pnp, mcd off
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index bd45bb17c55..8dc48312890 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.32 1996/08/29 13:24:17 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.33 1996/09/02 02:34:09 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -52,7 +52,7 @@ pcmcia* at pcic?
npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
-isapnp0 at isa?
+#isapnp0 at isa?
pc0 at isa? port 0x60 irq 1 # generic PC console device
#vt0 at isa? port 0x60 irq 1
@@ -123,7 +123,7 @@ fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers
#fdc1 at isa? port 0x370 irq ? drq ?
fd* at fdc? drive ?
-mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives
+#mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives
wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers
#wdc1 at isa? port 0x170 irq 15