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