diff options
| author |   mglocker <mglocker@openbsd.org> | 2007-09-24 20:42:23 +0000 |
|---|---|---|
| committer | mglocker <mglocker@openbsd.org> | 2007-09-24 20:42:23 +0000 |
| commit | faea836b45f96857750086f97501897a1065ec42 (patch) | |
| tree | cdf531463ad79580f4cd283c020f8698e142a018 | |
| parent | Remove BCM4311 and BCM4312 which are PCIe chipsets and therefore will not (diff) | |
| download | wireguard-openbsd-faea836b45f96857750086f97501897a1065ec42.tar.xz wireguard-openbsd-faea836b45f96857750086f97501897a1065ec42.zip | |
Add bwi PCI and Cardbus GENERIC entries for i386 and amd64, but still
disabled for now.
From brad@
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 55a7d16bfcf..6f6c802a1f2 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.196 2007/09/12 18:18:27 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.197 2007/09/24 20:42:23 mglocker Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -398,6 +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) 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 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 |