diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:23:57 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-26 09:23:57 +1100 |
| commit | 2a859ab07b6ab66f4134c4fffc341398bd3d328c (patch) | |
| tree | c5e7eaf3bffbc18feb326940e39794328d98dc07 /drivers/net/wireless/rt2x00/rt2800usb.c | |
| parent | cedddd812a79a4fda3885a15711aee3de78c4a24 (diff) | |
| parent | e716e014384688d1a50d1aa5213ee74748c6d4e0 (diff) | |
| download | kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.tar.gz kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.tar.bz2 kernel_replicant_linux-2a859ab07b6ab66f4134c4fffc341398bd3d328c.zip | |
Merge branch 'merge' into next
Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index c9e9370eb789..3b8fb5a603f2 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -1282,6 +1282,7 @@ static struct usb_driver rt2800usb_driver = { .disconnect = rt2x00usb_disconnect, .suspend = rt2x00usb_suspend, .resume = rt2x00usb_resume, + .reset_resume = rt2x00usb_resume, .disable_hub_initiated_lpm = 1, }; |