staging: brcm80211: only enable brcmsmac if bcma is not set
authorHenry Ptasinski <henryp@broadcom.com>
Tue, 23 Aug 2011 12:13:53 +0000 (14:13 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 23 Aug 2011 20:10:13 +0000 (13:10 -0700)
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>
drivers/staging/brcm80211/Kconfig

index 621570a77bcc52addf6f22fe97521856fdece198..ef77b44ec8ea5f73c8e5641adcacba588790153f 100644 (file)
@@ -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