diff options
| author | John W. Linville | 2014-01-17 20:43:17 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-01-17 20:43:17 +0100 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /drivers/net/wireless/ti/wl1251 | |
| parent | Merge branch 'virtio_rx_merging' (diff) | |
| parent | carl9170: use ath_is_mybeacon (diff) | |
| download | kernel-qcow2-linux-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.gz kernel-qcow2-linux-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.xz kernel-qcow2-linux-7916a075571f0ccd0830cf3da293188a8b6045e3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 119c148f7740..757e25784a8a 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 | |