diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-24 18:45:50 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-24 18:45:50 (GMT) |
| commit | 9fbdc75116f7a2b183464d42f3abccb616584105 (patch) | |
| tree | 5758c79362e6954d486442213f719bd7a713e303 /drivers | |
| parent | 66ba271ab90424ba5a895662b6783c4837a96e0a (diff) | |
| parent | b8f4e068004859eefac7b1ced59ddb67ca6d2d80 (diff) | |
| download | linux-fsl-qoriq-9fbdc75116f7a2b183464d42f3abccb616584105.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 81f1275..de4cf4d 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -1619,6 +1619,7 @@ static struct usb_driver btusb_driver = { #ifdef CONFIG_PM .suspend = btusb_suspend, .resume = btusb_resume, + .reset_resume = btusb_resume, #endif .id_table = btusb_table, .supports_autosuspend = 1, |