diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 00:30:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 00:30:03 +0200 |
| commit | ff49896aa45de286f3cbfda800fc92665374546a (patch) | |
| tree | d05c73f3e13449a4668a5ca8ff63de6f8f73a807 /drivers/vme | |
| parent | USB: OHCI: Allow runtime PM without system sleep (diff) | |
| parent | xhci: Fix warning introduced by disabling runtime PM. (diff) | |
| download | linux-ff49896aa45de286f3cbfda800fc92665374546a.tar.xz linux-ff49896aa45de286f3cbfda800fc92665374546a.zip | |
Merge tag 'for-usb-next-2013-08-27-15-07' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next
Sarah writes:
xhci: Fix build breakage and new warnings.
Hi Greg,
This first patch should fix the build breakage Sedat Dilek reported.
Apologizes for not including this patch before commit
0730d52a86919300a39a2be37f6c140997dfb82f "xhci:prevent "callbacks suppressed"
when debug is not enabled"
The second patch fixes a new build warning introduced by commit
c8476fb855434c733099079063990e5bfa7ecad6 "usb: xhci: Disable runtime PM suspend
for quirky controllers", which was caught by the 0day build system.
Sarah Sharp
Diffstat (limited to 'drivers/vme')
0 files changed, 0 insertions, 0 deletions