---

yaml --- r: 267499 b: refs/heads/master c: 75e07b6 h: refs/heads/master i: 267497: b8b3402 267495: 59bc091 v: v3
git-mirror · Aug 23, 2011 · 099586d · 099586d
1 parent e69d8e5
commit 099586d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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