summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-04-03 01:53:37 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-04-03 01:53:37 +0000
commit273dd298fce1a47cdde27bc0722dfe0a7be81d0d (patch)
tree3b0478a757d88b3bc09b4f0ad07effc6d9abbb5d /sys/arch/i386/conf
parent92028eff289924ff45268cda6afa50082e10722b (diff)
split wireless cards into their own section
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8d81d53fe0c..3239329b0f0 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.168 2000/04/03 01:39:12 mickey Exp $
+# $OpenBSD: GENERIC,v 1.169 2000/04/03 01:53:36 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -252,10 +252,6 @@ ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet
ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet
sm* at pcmcia? function ? # PCMCIA based sm ethernet
xe* at pcmcia? function ? # Xircom ethernet
-wi* at pcmcia? function ? # WaveLAN IEEE 802.11
-an* at pcmcia? function ? # Aironet IEEE 802.11
-#cnw* at pcmcia? function ? # Xircom Netwave
-#ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
xl* at pci? dev ? function ? # 3c9xx ethernet
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
@@ -272,6 +268,12 @@ skc* at pci? dev ? function ? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
wx* at pci? dev ? function ? # Intel Pro/1000 ethernet
+# Wireless network cards
+wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS
+an* at pcmcia? function ? # Aironet IEEE 802.11DS
+#cnw* at pcmcia? function ? # Xircom Netwave
+#ray* at pcmcia? function ? # Raylink Aviator2.4/Pro 802.11FH
+
# Media Independent Interface (mii) drivers
exphy* at mii? phy ? # 3Com internal PHYs
inphy* at mii? phy ? # Intel 82555 PHYs