staging: brcm80211: only enable brcmsmac if bcma is not set

brcmsmac doesn't yet use bcma, but both drivers attempt to claim the same
device.  For now, turn of brcmsmac if bcma is enabled.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig
index 621570a77bcc52addf6f22fe97521856fdece198..ef77b44ec8ea5f73c8e5641adcacba588790153f 100644 (file)
--- a/drivers/staging/brcm80211/Kconfig
+++ b/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