diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-12-14 09:03:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-12-14 09:03:52 -0500 |
commit | 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 (patch) | |
tree | bfd4e2766ce8587bb78c77aef74697070fc04918 /drivers | |
parent | c2521653f4f299b8946fb7073ac90ed5d3d5de7c (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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 4 |
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) | |||
4048 | /* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */ | 4048 | /* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */ |
4049 | static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid) | 4049 | static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid) |
4050 | { | 4050 | { |
4051 | #ifdef CONFIG_B43_BCMA | ||
4051 | struct bcma_drv_cc *cc = &dev->dev->bdev->bus->drv_cc; | 4052 | struct bcma_drv_cc *cc = &dev->dev->bdev->bus->drv_cc; |
4052 | u32 pmu_ctl; | 4053 | u32 pmu_ctl; |
4053 | if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) { | 4054 | 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) | |||
4098 | return; | 4099 | return; |
4099 | } | 4100 | } |
4100 | bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl); | 4101 | bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl); |
4102 | #else | ||
4103 | return; | ||
4104 | #endif | ||
4101 | } | 4105 | } |
4102 | 4106 | ||
4103 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */ | 4107 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */ |