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 /drivers | |
| parent | c046555966e4a3a75b731e05ece3b1d763ac56ae (diff) | |
| parent | b1a8014471b01dd862de9f91bbbff1296afac42d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'drivers')
| -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 = { | |||
| 1629 | #ifdef CONFIG_PM | 1629 | #ifdef CONFIG_PM |
| 1630 | .suspend = btusb_suspend, | 1630 | .suspend = btusb_suspend, |
| 1631 | .resume = btusb_resume, | 1631 | .resume = btusb_resume, |
| 1632 | .reset_resume = btusb_resume, | ||
| 1633 | #endif | 1632 | #endif |
| 1634 | .id_table = btusb_table, | 1633 | .id_table = btusb_table, |
| 1635 | .supports_autosuspend = 1, | 1634 | .supports_autosuspend = 1, |