diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 11:55:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 11:55:53 +0000 |
| commit | 49c42b458929aa5df4f3df028f34f49ceb1388e8 (patch) | |
| tree | 29ec6f105a58d9ac38a81814d9a1df7e55ea2bd1 /drivers/usb/host/xhci.h | |
| parent | 11fd101c2ff91afae2e1d79e33caa9f50430ab14 (diff) | |
| parent | 356a3e1fde11190febb8ace3cdab8694848ed220 (diff) | |
Merge tag 'v3.14.26' into linux-linaro-lsk-v3.14
This is the 3.14.26 stable release
Diffstat (limited to 'drivers/usb/host/xhci.h')
| -rw-r--r-- | drivers/usb/host/xhci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 8faef64371c6..96e9e780ccae 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1760,7 +1760,7 @@ void xhci_shutdown(struct usb_hcd *hcd); int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks); #ifdef CONFIG_PM -int xhci_suspend(struct xhci_hcd *xhci); +int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup); int xhci_resume(struct xhci_hcd *xhci, bool hibernated); #else #define xhci_suspend NULL |