diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:58:21 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:58:21 -0500 |
| commit | 6b732323c1e1ced5c76350bfef2cc8c233f9dcb9 (patch) | |
| tree | 9107bbe331f51bf1c5db11d4744583b042bf2585 | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next (diff) | |
| parent | Bluetooth: revert: "Bluetooth: Add missing reset_resume dev_pm_ops" (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
| -rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 30868fa870f6..c0ff34f2d2df 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -1629,7 +1629,6 @@ 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, |