Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux

[cascardo/linux.git] / drivers / net / wireless / at76c50x-usb.c

diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 031d4ec..99b3bfa 100644 (file)
--- 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;
 }