summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-09-24 20:42:24 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-09-24 20:42:24 +0000
commitf02a868e5f8c22cfaf51f60ca545f0e0065519a3 (patch)
treed6ec7fd2cec03c16b029f5a2a20a81d0a8a1e0cd /sys/arch/i386
parent6f586ef9a5b34af974de84b72d055ecb44f6421e (diff)
Add bwi PCI and Cardbus GENERIC entries for i386 and amd64, but still
disabled for now. From brad@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4222dc45516..1b0f2278848 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.575 2007/09/09 15:59:47 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.576 2007/09/24 20:42:23 mglocker Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -549,6 +549,8 @@ 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)
+bwi* at pci? # Broadcom AirForce (802.11b/g)
+bwi* at cardbus? # Broadcom AirForce (802.11b/g)
wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS
#awi* at pcmcia? # Bay Networks IEEE 802.11FH