Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

6b732323 · John W. Linville · c0465559 · b1a80144 · 6b732323
Commit 6b732323 authored Nov 05, 2013 by John W. Linville
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

drivers/bluetooth/btusb.c drivers/bluetooth/btusb.c +0 -1

No files found.
--- 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,