diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-05 11:03:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-05 11:03:07 -0500 |
| commit | 76eb75be79b52a3c6ae1fd840083fa1a04458c1c (patch) | |
| tree | bb90a570be2b1f521913b6233e11bae841608ad0 /drivers/net/usb/asix_devices.c | |
| parent | 57ea884b0dcf1e59661955919976ef138ec9cdb0 (diff) | |
| parent | e02003b515e8d95f40f20f213622bb82510873d2 (diff) | |
| download | talos-obmc-linux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.tar.gz talos-obmc-linux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/usb/asix_devices.c')
| -rw-r--r-- | drivers/net/usb/asix_devices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index 6c646e228833..6e98ede997d3 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -1367,6 +1367,7 @@ static struct usb_driver asix_driver = { .probe = usbnet_probe, .suspend = asix_suspend, .resume = asix_resume, + .reset_resume = asix_resume, .disconnect = usbnet_disconnect, .supports_autosuspend = 1, .disable_hub_initiated_lpm = 1, |
