diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 09:09:48 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 09:09:48 +0100 |
| commit | 6fb47de9cf1be4710fb9f364c500ff216fb47b34 (patch) | |
| tree | e638cd1de972e7120dff9200efe71ce1b4ca3805 /drivers/net/wireless/rt2x00/rt73usb.c | |
| parent | 1041638f2bba0f1de75e66086d50fb1251d64dcf (diff) | |
| parent | ab3d59d265e772e734c36fe738809cb1a910f566 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index e5eb43b3eee7..24eec66e9fd2 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c @@ -2535,6 +2535,7 @@ static struct usb_driver rt73usb_driver = { .disconnect = rt2x00usb_disconnect, .suspend = rt2x00usb_suspend, .resume = rt2x00usb_resume, + .reset_resume = rt2x00usb_resume, .disable_hub_initiated_lpm = 1, }; |