diff options
author | Tony Lindgren <tony@atomide.com> | 2012-11-09 14:58:01 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 14:58:01 -0800 |
commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /drivers/net/wireless/rt2x00/rt73usb.c | |
parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
download | blackbird-op-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.gz blackbird-op-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.zip |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
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, }; |