From 099586d5624349039a0fe05892d8bf9f6ae14c9c Mon Sep 17 00:00:00 2001
From: Henry Ptasinski <henryp@broadcom.com>
Date: Tue, 23 Aug 2011 14:13:53 +0200
Subject: [PATCH] --- yaml --- r: 267499 b: refs/heads/master c:
 75e07b6b2bcb1dad971870a039d5f1441e64bd58 h: refs/heads/master i:   267497:
 b8b340209644af045c0993eb42ed7060c967e835   267495:
 59bc0915593b548902a450397f1d736ec4dadfa4 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/brcm80211/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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