summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-11-07 03:45:51 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-11-07 03:45:51 +0000
commit0c05f48ed59ecb791e715c88b8d2918e85230b6a (patch)
treeb9f78707649ba5e2f3557e07490acbb37b5da913 /sys/arch
parent30611f886941659704e1418e7c3d1b2ff21fb056 (diff)
enable ath, iwi, and ipw
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/GENERIC10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index cca92e82002..c41708db5ea 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.383 2004/11/02 02:45:36 reyk Exp $
+# $OpenBSD: GENERIC,v 1.384 2004/11/07 03:45:50 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -420,8 +420,8 @@ hme* at pci? # Sun Happy Meal
bce* at pci? # Broadcom BCM4401
# Wireless network cards
-#ath* at pci? # Atheros AR5k (802.11a/b/g)
-#ath* at cardbus? # Atheros AR5k (802.11a/b/g)
+ath* at pci? # Atheros AR5k (802.11a/b/g)
+ath* at cardbus? # Atheros AR5k (802.11a/b/g)
atw* at pci? # ADMtek ADM8211 (802.11)
atw* at cardbus? # ADMtek ADM8211 (802.11)
wi* at pci? # WaveLAN IEEE 802.11DS
@@ -432,8 +432,8 @@ an* at isapnp? # Aironet IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
-#ipw* at pci? # Intel PRO/Wireless 2100
-#iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG/2915ABG
+ipw* at pci? # Intel PRO/Wireless 2100
+iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG/2915ABG
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs