diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-28 23:06:05 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-28 23:06:05 -0700 |
commit | b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636 (patch) | |
tree | 9507b9d129ea8d7598d79f4b5674865483c7f00b /drivers/net/wireless/b43/phy_g.c | |
parent | 6c9888532bb540cb692f51f1d34fe9344eed5a0d (diff) | |
parent | ad43f8bfb7b9a6a8b800cdad24c4a62180a5eb3d (diff) | |
download | kernel-crypto-b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636.tar.gz kernel-crypto-b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636.tar.xz kernel-crypto-b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/phy_g.c')
-rw-r--r-- | drivers/net/wireless/b43/phy_g.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c index e47131216a6..bdff9afe3f8 100644 --- a/drivers/net/wireless/b43/phy_g.c +++ b/drivers/net/wireless/b43/phy_g.c @@ -2664,7 +2664,7 @@ static void b43_gphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna) tmp = b43_phy_read(dev, B43_PHY_BBANDCFG); tmp &= ~B43_PHY_BBANDCFG_RXANT; - tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna) + tmp |= (autodiv ? B43_ANTENNA_AUTO1 : antenna) << B43_PHY_BBANDCFG_RXANT_SHIFT; b43_phy_write(dev, B43_PHY_BBANDCFG, tmp); |