summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-11-05 15:58:21 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-11-05 15:58:21 -0500
commit6b732323c1e1ced5c76350bfef2cc8c233f9dcb9 (patch)
tree9107bbe331f51bf1c5db11d4744583b042bf2585
parentc046555966e4a3a75b731e05ece3b1d763ac56ae (diff)
parentb1a8014471b01dd862de9f91bbbff1296afac42d (diff)
downloadop-kernel-dev-6b732323c1e1ced5c76350bfef2cc8c233f9dcb9.zip
op-kernel-dev-6b732323c1e1ced5c76350bfef2cc8c233f9dcb9.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
-rw-r--r--drivers/bluetooth/btusb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 30868fa..c0ff34f 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,
OpenPOWER on IntegriCloud