summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-09-24 18:19:47 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-09-24 18:19:47 +0000
commit339e62073e06ba6a375817758eea993a70455970 (patch)
treeebc5edd74e0c7423e159e518ad8e247c55352880
parent42f9bba9782524eb4fd5e7be6bc82ce43507780c (diff)
Disable ex0 because its intrusive probe. When busified we can
try it again.
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4f64471f7d6..0aa640a7896 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.48 1997/09/24 17:17:41 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.49 1997/09/24 18:19:45 niklas Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -146,7 +146,7 @@ eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards
el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
ep0 at isa? port ? irq ? # 3C509 ethernet cards
ep* at isa? port ? irq ? # 3C509 ethernet cards
-ex0 at isa? port ? irq ? # Intel EtherExpress PRO/10
+#ex0 at isa? port ? irq ? # Intel EtherExpress PRO/10
ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507
ie1 at isa? port 0x300 irq 10 # EtherExpress
le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index f2e1002a27e..11b1ffb974f 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.14 1997/09/24 17:17:42 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.15 1997/09/24 18:19:46 niklas Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -152,7 +152,7 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10
#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
ep0 at isa? port ? irq ? # 3C509 ethernet cards
ep* at isa? port ? irq ? # 3C509 ethernet cards
-ex0 at isa? port ? irq ? # Intel EtherExpress PRO/10
+#ex0 at isa? port ? irq ? # Intel EtherExpress PRO/10
ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507
ie1 at isa? port 0x300 irq 10 # EtherExpress
le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA