xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.12-rc3 into usb-next

Browse Source 
We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2013-09-29 18:45:55 -07:00
parent f1ddc24c9e 15c03dd485
commit df9b17f586
230 changed files with 2350 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/host/uhci-pci.c
View File

@@ -293,7 +293,7 @@ static struct pci_driver uhci_pci_driver = {
.remove = usb_hcd_pci_remove,
.shutdown = uhci_shutdown,
#ifdef CONFIG_PM_SLEEP
#ifdef CONFIG_PM
.driver = {
.pm = &usb_hcd_pci_pm_ops
},