---

yaml --- r: 86483 b: refs/heads/master c: f9d8f88 h: refs/heads/master i: 86481: ddac5c5 86479: 2a35170 v: v3
git-mirror · Feb 28, 2008 · 4a53adc · 4a53adc
1 parent b269bfd
commit 4a53adc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7084535c9d2b8bcfc19f1ad9452eabde742ae22
+refs/heads/master: f9d8f88952c263a4eeaaa0fc6ff726d2315b6a57
diff --git a/trunk/drivers/net/wireless/bcm43xx/Kconfig b/trunk/drivers/net/wireless/bcm43xx/Kconfig
@@ -1,6 +1,6 @@
 config BCM43XX
 	tristate "Broadcom BCM43xx wireless support (DEPRECATED)"
-	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL
+	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && (!SSB_B43_PCI_BRIDGE || SSB != y) && EXPERIMENTAL
 	select WIRELESS_EXT
 	select FW_LOADER
 	select HW_RANDOM