Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[sfrench/cifs-2.6.git] / drivers / net / wireless / bcm43xx / Kconfig

diff --git a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig
index ce397e4284f4e450656315eb0a38e8444a79ed25..afb8f4305c244e784c0e2e412622038fc37de6a2 100644 (file)
--- a/drivers/net/wireless/bcm43xx/Kconfig
+++ b/drivers/net/wireless/bcm43xx/Kconfig
@@ -1,12 +1,15 @@
 config BCM43XX
-       tristate "Broadcom BCM43xx wireless support"
-       depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL
+       tristate "Broadcom BCM43xx wireless support (DEPRECATED)"
+       depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && (!SSB_B43_PCI_BRIDGE || SSB != y) && EXPERIMENTAL
        select WIRELESS_EXT
        select FW_LOADER
        select HW_RANDOM
        ---help---
-         This is an experimental driver for the Broadcom 43xx wireless chip,
-         found in the Apple Airport Extreme and various other devices.
+         This is an experimental driver for the Broadcom 43xx wireless
+         chip, found in the Apple Airport Extreme and various other
+         devices.  This driver is deprecated and will be removed
+         from the kernel in the near future.  It has been replaced
+         by the b43 and b43legacy drivers.
 
 config BCM43XX_DEBUG
        bool "Broadcom BCM43xx debugging (RECOMMENDED)"