From 63a960d2b48f480b359964cfcb340d269dac93bf Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Fri, 28 Sep 2012 00:07:10 +0000 Subject: [PATCH] --- yaml --- r: 328127 b: refs/heads/master c: c954679cf76095b0a1232c3dad604a9066d78ab1 h: refs/heads/master i: 328125: e61d2d95b7b8cae94af8359fc274589df7d156bb 328123: ea7d1b2888bba535af24a35308bfa86b1f8fb920 328119: 9203d871c612e8f6d446f23280b266497f06d8e1 328111: 13040b0dcfb85aba1da12b5fa36de08901c7e6d9 328095: 8a16a488855f17cebb3a911689bb093b6e0f9e22 328063: cd3e41ca4467be768cc2476da3e4fb1de325a187 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/smsc95xx.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 43c51608c8a3..7a6838fd0de8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 769ea6d89d5b915415a95432ff102c0aaf65e916 +refs/heads/master: c954679cf76095b0a1232c3dad604a9066d78ab1 diff --git a/trunk/drivers/net/usb/smsc95xx.c b/trunk/drivers/net/usb/smsc95xx.c index d0ff01ee0b62..f29860d6341a 100644 --- a/trunk/drivers/net/usb/smsc95xx.c +++ b/trunk/drivers/net/usb/smsc95xx.c @@ -1282,6 +1282,7 @@ static struct usb_driver smsc95xx_driver = { .probe = usbnet_probe, .suspend = usbnet_suspend, .resume = usbnet_resume, + .reset_resume = usbnet_resume, .disconnect = usbnet_disconnect, .disable_hub_initiated_lpm = 1, };