diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 10:10:07 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 10:10:07 -0600 |
commit | 8c31b1635b91e48f867e010cd7bcd06393e5858a (patch) | |
tree | 4981add7e38e24724d255dedeb03f93be34d33ec /drivers/net/usb/cdc_ncm.c | |
parent | 121a2dd860f8348fb014b660f133a0cb9a16273e (diff) | |
parent | 2ce420da39078a6135d1c004a0e4436fdc1458b4 (diff) |
Merge branch 'gpio/next-mx' into gpio/next
Diffstat (limited to 'drivers/net/usb/cdc_ncm.c')
-rw-r--r-- | drivers/net/usb/cdc_ncm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index cdd3ae486109..f33ca6aa29e9 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -54,7 +54,7 @@ #include <linux/usb/usbnet.h> #include <linux/usb/cdc.h> -#define DRIVER_VERSION "24-May-2011" +#define DRIVER_VERSION "01-June-2011" /* CDC NCM subclass 3.2.1 */ #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10 @@ -1234,6 +1234,7 @@ static struct usb_driver cdc_ncm_driver = { .disconnect = cdc_ncm_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, + .reset_resume = usbnet_resume, .supports_autosuspend = 1, }; |