summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-12-26 08:16:49 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-12-26 08:16:49 +0000
commit348dcb45cb2caf70f866d9a1513183809cc520fd (patch)
tree3f3f49a937ffb07d8bc06f26a5fc2157335615b4 /sys
parent93d43ae87e751d4be6b33367a403a5dee1dbabe2 (diff)
support le/pccom on isapnp
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/conf/GENERIC7
-rw-r--r--sys/arch/i386/conf/RAMDISK5
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b3fc27856c9..f9e4dc45035 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.57 1997/12/19 03:02:48 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.58 1997/12/26 08:16:48 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -60,7 +60,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
@@ -77,6 +77,7 @@ pccom* at ast? slave ?
#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards
#pccom* at rtfps? slave ?
pccom3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
+pccom* at isapnp?
# option for using CD1400 handshaking for incoming data
# requires a special cable that exchanges the RTS and DTR lines
@@ -159,6 +160,7 @@ ep0 at eisa? slot ?
ep* at eisa? slot ? # 3C579 ethernet cards
fea* at eisa? slot ? # DEC DEFEA FDDI cards
le* at pci? dev ? function ? # PCnet-PCI based ethernet cards
+le* at isapnp?
de* at pci? dev ? function ? # DC21X4X-based ethernet cards
fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards
ed* at pci? dev ? function ? # NE2000-compat ethernet cards
@@ -181,3 +183,4 @@ gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis UltraSound (flags is record
#joy0 at isa? port 0x201
pseudo-device pctr 1
+#option DEBUG_ISAPNP
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 9b8303f955d..44565758714 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.23 1997/12/19 03:02:49 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.24 1997/12/26 08:16:48 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -76,6 +76,7 @@ pcmcia* at pcic?
npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
+isapnp0 at isa?
#pc0 at isa? port 0x60 irq 1 # generic PC console device
vt0 at isa? port 0x60 irq 1
@@ -91,6 +92,7 @@ pccom2 at isa? port 0x3e8 irq 5
#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards
#pccom* at rtfps? slave ?
pccom3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
+pccom* at isapnp?
# option for using CD1400 handshaking for incoming data
# requires a special cable that exchanges the RTS and DTR lines
@@ -166,6 +168,7 @@ ep0 at eisa? slot ?
ep* at eisa? slot ? # 3C579 ethernet cards
#fea* at eisa? slot ? # DEC DEFEA FDDI cards
le* at pci? dev ? function ? # PCnet-PCI based ethernet cards
+le* at isapnp?
de* at pci? dev ? function ? # DC21X4X-based ethernet cards
fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards
ep0 at pci? dev ? function ? # 3C590 ethernet cards