From 4a53adcf79ae1aa9b5ddd9178ce03ba024192386 Mon Sep 17 00:00:00 2001 From: Alexey Zaytsev Date: Sat, 23 Feb 2008 13:33:07 +0300 Subject: [PATCH] --- yaml --- r: 86483 b: refs/heads/master c: f9d8f88952c263a4eeaaa0fc6ff726d2315b6a57 h: refs/heads/master i: 86481: ddac5c5e6da20a95196b17fa428e40f63cb51c10 86479: 2a351704f42c537888d3d5f5e752d8deee5dcdd1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/bcm43xx/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a806002e669..64985f64d7b5 100644 --- 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 index 0159701e8456..afb8f4305c24 100644 --- 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