diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-16 09:17:12 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-16 09:17:12 -0800 |
commit | b5e4156743c5d42b736936be7a9ee8d72e0e4ac9 (patch) | |
tree | f0edde33e7b2502ab35a4f63be1a8be31f5f4b6a /drivers/net/wireless/b43legacy/rfkill.c | |
parent | 6b35308850e1679741e8b646cfb7bb3ab5369888 (diff) | |
parent | b1d771ee33c6e4006676002b9d74abf45b71d3d6 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/rfkill.c')
-rw-r--r-- | drivers/net/wireless/b43legacy/rfkill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c index d579df72b78..b90f223fb31 100644 --- a/drivers/net/wireless/b43legacy/rfkill.c +++ b/drivers/net/wireless/b43legacy/rfkill.c @@ -29,7 +29,7 @@ /* Returns TRUE, if the radio is enabled in hardware. */ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev) { - if (dev->phy.rev >= 3) { + if (dev->dev->id.revision >= 3) { if (!(b43legacy_read32(dev, B43legacy_MMIO_RADIO_HWENABLED_HI) & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK)) return 1; |