summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-12-14 09:03:52 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-14 09:03:52 -0500
commit8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 (patch)
treebfd4e2766ce8587bb78c77aef74697070fc04918
parentc2521653f4f299b8946fb7073ac90ed5d3d5de7c (diff)
b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
Avoids this: ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined! Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/phy_n.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 6b95fd29514..154f97dc378 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -4048,6 +4048,7 @@ int b43_phy_initn(struct b43_wldev *dev)
/* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */
static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
{
+#ifdef CONFIG_B43_BCMA
struct bcma_drv_cc *cc = &dev->dev->bdev->bus->drv_cc;
u32 pmu_ctl;
if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) {
@@ -4098,6 +4099,9 @@ static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
return;
}
bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl);
+#else
+ return;
+#endif
}
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */