Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / b43 / phy.c

diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c
index 575c5436ebdfdcdcfcd8ab56a8671c1da3dd0a9a..de024dc03718571296577a14bac34467b3ffd0f8 100644 (file)
--- 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)
 void b43_set_rx_antenna(struct b43_wldev *dev, int antenna)
 {
        struct b43_phy *phy = &dev->phy;
-       u32 hf;
+       u64 hf;
        u16 tmp;
        int autodiv = 0;