From 7b2d87525c694f2c352dac3e6ab5e612b3bec1f9 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 14 Dec 2011 09:03:52 -0500
Subject: [PATCH] --- yaml --- r: 278953 b: refs/heads/master c:
 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 h: refs/heads/master i:   278951:
 85bc2351c6d3664efce33976d4c5623f49494ba8 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/wireless/b43/phy_n.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 202a4c09a4d1..b91ce382ac05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2521653f4f299b8946fb7073ac90ed5d3d5de7c
+refs/heads/master: 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
index 6b95fd29514f..154f97dc3780 100644
--- a/trunk/drivers/net/wireless/b43/phy_n.c
+++ b/trunk/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 */