diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-23 22:44:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-23 22:44:58 -0400 |
| commit | 6440be177f56e0b52dd81df82b78875d9a07d5f9 (patch) | |
| tree | 52d8f98694a7b1e2bee2595e3d9613f6d75c7385 /drivers/net/wireless/b43/phy.c | |
| parent | 49186b4a083655a4ebf54e94baf0736256b01b47 (diff) | |
| parent | 099714934d80100624829f1e2961b9dccaef3280 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/phy.c')
| -rw-r--r-- | drivers/net/wireless/b43/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c index 575c5436ebd..de024dc0371 100644 --- a/drivers/net/wireless/b43/phy.c +++ b/drivers/net/wireless/b43/phy.c | |||
| @@ -2043,7 +2043,7 @@ int b43_phy_init(struct b43_wldev *dev) | |||
| 2043 | void b43_set_rx_antenna(struct b43_wldev *dev, int antenna) | 2043 | void b43_set_rx_antenna(struct b43_wldev *dev, int antenna) |
| 2044 | { | 2044 | { |
| 2045 | struct b43_phy *phy = &dev->phy; | 2045 | struct b43_phy *phy = &dev->phy; |
| 2046 | u32 hf; | 2046 | u64 hf; |
| 2047 | u16 tmp; | 2047 | u16 tmp; |
| 2048 | int autodiv = 0; | 2048 | int autodiv = 0; |
| 2049 | 2049 | ||