summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-20 12:56:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-20 12:56:46 +0000
commit2f78367a903bf36499fa179eb4867a6b95f4f270 (patch)
treee0afc2ae881682fe656aab262f10411dfd73acc1 /sys/arch/i386/conf/GENERIC
parentc72b61b19e39b40f2b2ad8b1bfce43b243b442a4 (diff)
disable the intel wireless stuff by default
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b665c8a8e39..e392ef61dbd 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.381 2004/10/20 12:50:48 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.382 2004/10/20 12:56:45 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -430,8 +430,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