diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-23 20:09:39 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-23 20:09:39 +0200 |
| commit | ec094144cdd54a36e65a69161e9705959c09cb23 (patch) | |
| tree | 5a41c0f766143e462bfde8515ca6547d4ee7f78e /drivers/net/wireless/b43 | |
| parent | mwifiex: remove redundant initialization for bss_descriptor (diff) | |
| parent | ath9k_hw: change AR9580 initvals to fix a stability issue (diff) | |
| download | linux-ec094144cdd54a36e65a69161e9705959c09cb23.tar.xz linux-ec094144cdd54a36e65a69161e9705959c09cb23.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index e05dd117f215..7ed39e9daa7f 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c @@ -5109,7 +5109,8 @@ static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid) #endif #ifdef CONFIG_B43_SSB case B43_BUS_SSB: - /* FIXME */ + ssb_pmu_spuravoid_pllupdate(&dev->dev->sdev->bus->chipco, + avoid); break; #endif } |