summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2007-09-30 10:16:57 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2007-09-30 10:16:57 +0000
commitfbd4c04a43ea0c5d146e437c3e76aa929593d051 (patch)
treefe0c24a63be83d46508680a15aba22e1ac01272c /sys
parentc3683a440564cd68d673d65fbcb808c6176926ad (diff)
Enable Broadcom wireless, bwi(4).
If people testing could send mail to mglocker and myself we'd appreciate it. ok mglocker@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC6
-rw-r--r--sys/arch/macppc/conf/GENERIC4
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 6f6c802a1f2..92c658c0362 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.197 2007/09/24 20:42:23 mglocker Exp $
+# $OpenBSD: GENERIC,v 1.198 2007/09/30 10:16:56 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -398,8 +398,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)
+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
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 0d1e8f2e1ee..ff7e30ae060 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.577 2007/09/24 20:44:27 mglocker Exp $
+# $OpenBSD: GENERIC,v 1.578 2007/09/30 10:16:56 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -549,8 +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)
+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
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 0e4a0a39235..a8085829a5c 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.172 2007/09/09 01:37:28 jsg Exp $g
+# $OpenBSD: GENERIC,v 1.173 2007/09/30 10:16:56 jsg Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -88,6 +88,8 @@ mskc* at pci? # Marvell Yukon-2
msk* at mskc? # each port of above
an* at pci? # Cisco/Aironet
atw* at pci? # 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
ral* at pci? # Ralink RT2500/RT2501/RT2600
rtw* at pci? # Realtek 8180