diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-01-17 20:43:17 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 20:43:17 +0100 |
commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /drivers/net/wireless/adm8211.c | |
parent | Merge branch 'virtio_rx_merging' (diff) | |
parent | carl9170: use ath_is_mybeacon (diff) | |
download | linux-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.xz 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/adm8211.c')
-rw-r--r-- | drivers/net/wireless/adm8211.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 55eda7afc041..f35f93c31b09 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c @@ -1865,7 +1865,6 @@ static int adm8211_probe(struct pci_dev *pdev, dev->flags = IEEE80211_HW_SIGNAL_UNSPEC; dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); - dev->channel_change_time = 1000; dev->max_signal = 100; /* FIXME: find better value */ dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */ |