Commit 75e07b6b authored by Henry Ptasinski's avatar Henry Ptasinski Committed by Greg Kroah-Hartman
Browse files

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: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dcaf762f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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