diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /drivers/net/wireless/at76c50x-usb.c | |
| parent | cf84eb0b09c0f09b4c70a648b9dfeec78be61f07 (diff) | |
| parent | e4e19c031901e95dc7d1cf0a2c9c50525d71651f (diff) | |
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/at76c50x-usb.c')
| -rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 031d4ec64779..99b3bfa717d5 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) | |||
| 2112 | priv->pm_period = 0; | 2112 | priv->pm_period = 0; |
| 2113 | 2113 | ||
| 2114 | /* unit us */ | 2114 | /* unit us */ |
| 2115 | priv->hw->channel_change_time = 100000; | ||
| 2116 | 2115 | ||
| 2117 | return priv; | 2116 | return priv; |
| 2118 | } | 2117 | } |