diff --git a/[refs] b/[refs]
index 1c70e4f53d49..19e70610b9d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcaf762fa4b8ea1ba7f0c0ebbc7c04a22a3ca0bd
+refs/heads/master: 75e07b6b2bcb1dad971870a039d5f1441e64bd58
diff --git a/trunk/drivers/staging/brcm80211/Kconfig b/trunk/drivers/staging/brcm80211/Kconfig
index 621570a77bcc..ef77b44ec8ea 100644
--- a/trunk/drivers/staging/brcm80211/Kconfig
+++ b/trunk/drivers/staging/brcm80211/Kconfig
@@ -7,6 +7,7 @@ config BRCMSMAC
 	default n
 	depends on PCI
 	depends on WLAN && MAC80211
+	depends on BCMA=n
 	select BRCMUTIL
 	select FW_LOADER
 	select CRC_CCITT