diff options
| author | Henry Ptasinski <henryp@broadcom.com> | 2011-08-23 14:13:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 13:10:13 -0700 |
| commit | 75e07b6b2bcb1dad971870a039d5f1441e64bd58 (patch) | |
| tree | 7c54dcb054a9804920d68fc0bb87818d1bca6903 /drivers/staging/brcm80211 | |
| parent | dcaf762fa4b8ea1ba7f0c0ebbc7c04a22a3ca0bd (diff) | |
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>
Diffstat (limited to 'drivers/staging/brcm80211')
| -rw-r--r-- | drivers/staging/brcm80211/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig index 621570a77bc..ef77b44ec8e 100644 --- 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 |