summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-04-03 21:14:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-04-03 21:14:14 +0000
commit096de65e468d52e54b31ce9a7869489a06ec4022 (patch)
tree2df6b89ff55e3d3822130eab6ce0ca7a2020eae6 /sys/arch/i386/conf/GENERIC
parent1965463aea3db0728c40b4525bc15f112a21de5c (diff)
put some DS/FH cards on some boot media
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e6a3268f91c..163879a752a 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.170 2000/04/03 01:59:19 mickey Exp $
+# $OpenBSD: GENERIC,v 1.171 2000/04/03 21:14:13 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -218,6 +218,7 @@ scsibus* at atapiscsi?
# Networking devices
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10 #
+#we2 at isa? port 0x280 iomem 0xd0000 irq 3 # WD/SMC 80x3 ethernet
we* at isapnp?
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet
ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet
@@ -231,7 +232,7 @@ ep* at isapnp? # 3C509 PnP ethernet
ep* at isa? port ? irq ? # 3C509 ethernet
ef* at isapnp? # 3C515 PnP ethernet
ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507
-ie1 at isa? port 0x300 irq 10 # EtherExpress
+#ie1 at isa? port 0x300 irq 10 # EtherExpress
le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
@@ -270,6 +271,7 @@ wx* at pci? dev ? function ? # Intel Pro/1000 ethernet
# Wireless network cards
wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS
+#awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH
an* at pcmcia? function ? # Aironet IEEE 802.11DS
#cnw* at pcmcia? function ? # Xircom Netwave
ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH