diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-28 11:03:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-28 11:03:29 -0800 |
| commit | 60717f7e761ca04925d17e90e556e689ab134cdc (patch) | |
| tree | f0daeeb9e5797a8b492453850f3bb764d94c4584 /drivers/net/wireless/bcm43xx/Kconfig | |
| parent | fbabbed8284d1526ed01754ecd4fabdb941a1ff2 (diff) | |
| parent | 2d8d4fdf78488f3362dccfd2a6bfdb4bc65c0858 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/bcm43xx/Kconfig')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig index 0159701e845..afb8f4305c2 100644 --- a/drivers/net/wireless/bcm43xx/Kconfig +++ b/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 |