diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-16 12:59:13 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 12:59:13 -0500 |
| commit | 26c6e80892d8c160dffaba85889bd4e65b1dacf6 (patch) | |
| tree | 0d7751d80ac44b9407270be246f83e8354fc26ba /drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | |
| parent | 6fc4adca6ce3e1d57a42707019dddcb883578a91 (diff) | |
| parent | d61f978b8f26d2392c88249f877e46e2c2b5561d (diff) | |
| download | talos-op-linux-26c6e80892d8c160dffaba85889bd4e65b1dacf6.tar.gz talos-op-linux-26c6e80892d8c160dffaba85889bd4e65b1dacf6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index a6f1e8166008..481345c23ded 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -4401,7 +4401,7 @@ static s32 brcmf_mode_to_nl80211_iftype(s32 mode) static void brcmf_wiphy_pno_params(struct wiphy *wiphy) { -#ifndef CONFIG_BRCMFISCAN +#ifndef CONFIG_BRCMISCAN /* scheduled scan settings */ wiphy->max_sched_scan_ssids = BRCMF_PNO_MAX_PFN_COUNT; wiphy->max_match_sets = BRCMF_PNO_MAX_PFN_COUNT; |
