summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/at76c50x-usb.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-01-13 19:40:59 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2014-01-13 19:40:59 (GMT)
commitf13352519ee8c4b22b87fc1a47743d1f53ea193e (patch)
tree48c18144f3e5e530ec61d5eadbb5a34675a69fe8 /drivers/net/wireless/at76c50x-usb.c
parent559c33d84da71e07816e692bfd73ad92675256a6 (diff)
parent26b0e411d37a2ca5992d02884dc3fa4e1907e598 (diff)
downloadlinux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.tar.xz
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
-rw-r--r--drivers/net/wireless/at76c50x-usb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 031d4ec..99b3bfa 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -2112,7 +2112,6 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev)
priv->pm_period = 0;
/* unit us */
- priv->hw->channel_change_time = 100000;
return priv;
}