From cbb2292480ba861d52b6ccb2355f08d0e8867eb1 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 23 Jan 2006 17:00:39 -0500 Subject: [PATCH] --- yaml --- r: 24687 b: refs/heads/master c: 70e5e983f8a3f801a96bfeb0682cd2955ec3c8ce h: refs/heads/master i: 24685: ea39968e23135e18a45e1fc02870dc008e19d61d 24683: bfcbe0281f6b4df2d21205cb4d20642a171887fb 24679: 48ed3649b154d6ba483f2a1860b5f065cc543d4c 24671: 6e141a0c35550aa3322ffc883bb8ebf007594e0a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/Kconfig | 8 ++++++++ trunk/drivers/net/wireless/Makefile | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d55004384292..f507320805b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f222313a61a5e134de80767b35c672b91e78383c +refs/heads/master: 70e5e983f8a3f801a96bfeb0682cd2955ec3c8ce diff --git a/trunk/drivers/net/wireless/Kconfig b/trunk/drivers/net/wireless/Kconfig index fd17aa8491b6..7c7dca112bf5 100644 --- a/trunk/drivers/net/wireless/Kconfig +++ b/trunk/drivers/net/wireless/Kconfig @@ -501,6 +501,14 @@ config PRISM54 source "drivers/net/wireless/hostap/Kconfig" +config BCM43XX + tristate "Broadcom BCM43xx wireless support" + depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL + select FW_LOADER + ---help--- + This is an experimental driver for the Broadcom 43xx wireless chip, + found in the Apple Airport Extreme and various other devices. + # yes, this works even when no drivers are selected config NET_WIRELESS bool diff --git a/trunk/drivers/net/wireless/Makefile b/trunk/drivers/net/wireless/Makefile index 3a6f7ba326ca..c86779879361 100644 --- a/trunk/drivers/net/wireless/Makefile +++ b/trunk/drivers/net/wireless/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o obj-$(CONFIG_PRISM54) += prism54/ obj-$(CONFIG_HOSTAP) += hostap/ +obj-$(CONFIG_BCM43XX) += bcm43xx/ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o