From a61aa94d524b3d075bee21947df76a290ad3b521 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Thu, 3 Dec 2009 11:41:07 +0000 Subject: [PATCH] --- yaml --- r: 172174 b: refs/heads/master c: 7f515790274d26d710303b7a1f23571ca93a6288 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/cdc_ether.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6826d2b1306b..9cc4e4b36f02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7fca0ccecd3f5a111e08df8439f0b884099ad59 +refs/heads/master: 7f515790274d26d710303b7a1f23571ca93a6288 diff --git a/trunk/drivers/net/usb/cdc_ether.c b/trunk/drivers/net/usb/cdc_ether.c index de3e36596779..197912d9c04a 100644 --- a/trunk/drivers/net/usb/cdc_ether.c +++ b/trunk/drivers/net/usb/cdc_ether.c @@ -618,6 +618,7 @@ static struct usb_driver cdc_driver = { .disconnect = usbnet_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, + .reset_resume = usbnet_resume, };