diff options
| author | John W. Linville | 2014-01-13 20:40:59 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-01-13 20:40:59 +0100 |
| commit | f13352519ee8c4b22b87fc1a47743d1f53ea193e (patch) | |
| tree | 48c18144f3e5e530ec61d5eadbb5a34675a69fe8 /drivers/net/wireless/ti/wl1251 | |
| parent | Merge branch 'for-linville' of git://github.com/kvalo/ath (diff) | |
| parent | mac80211_hwsim: restore regulatory testing functionality (diff) | |
| download | kernel-qcow2-linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.tar.gz kernel-qcow2-linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.tar.xz kernel-qcow2-linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/ti/wl1251')
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 80f92110a3bf..fa3909a72ad6 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c @@ -1468,7 +1468,6 @@ int wl1251_init_ieee80211(struct wl1251 *wl) /* unit us */ /* FIXME: find a proper value */ - wl->hw->channel_change_time = 10000; wl->hw->flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_SUPPORTS_PS | |