diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-30 04:28:59 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 04:28:59 (GMT) |
| commit | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch) | |
| tree | 2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /drivers/net/wireless/b43/main.c | |
| parent | 38bfd8f5bec496e8e0db8849e01c99a33479418a (diff) | |
| parent | b5dd884e682cae6b8c037f9d11f3b623b4cf2011 (diff) | |
| download | linux-fsl-qoriq-0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 751017b..ed6e96a 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -4501,7 +4501,6 @@ static void b43_op_stop(struct ieee80211_hw *hw) cancel_work_sync(&(wl->beacon_update_trigger)); - wiphy_rfkill_stop_polling(hw->wiphy); mutex_lock(&wl->mutex); if (b43_status(dev) >= B43_STAT_STARTED) { dev = b43_wireless_core_stop(dev); |