diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-26 19:23:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-26 19:23:29 -0700 |
| commit | 9b506833210fdaea2cd00e39368805e28f49492d (patch) | |
| tree | aa0c5b78ad5cec89bc227a52a25c306a598617da | |
| parent | 83c425d222007c8f4ff9f4676572aca5bc54f231 (diff) | |
| parent | d3474049ab6cfcf14274f5ab9f20c8f50b083eab (diff) | |
| download | linux-stable-9b506833210fdaea2cd00e39368805e28f49492d.tar.gz linux-stable-9b506833210fdaea2cd00e39368805e28f49492d.tar.bz2 linux-stable-9b506833210fdaea2cd00e39368805e28f49492d.zip | |
Merge tag 'usb-3.11-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB bugfix from Greg KH:
"Here is a single bugfix that resolves the "can not build the OHCI
driver with CONFIG_PM disabled" problem that lots of people have been
reporting with 3.11-rc7. Sorry about that one, it missed my build
tests, and it seems, a number of others as well.
Thank goodness for Guenter :)"
* tag 'usb-3.11-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: OHCI: fix build error related to ohci_suspend/resume
| -rw-r--r-- | drivers/usb/host/ohci-pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 0f1d193fef02..279b04910f00 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -305,9 +305,11 @@ static int __init ohci_pci_init(void) ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides); +#ifdef CONFIG_PM /* Entries for the PCI suspend/resume callbacks are special */ ohci_pci_hc_driver.pci_suspend = ohci_suspend; ohci_pci_hc_driver.pci_resume = ohci_resume; +#endif return pci_register_driver(&ohci_pci_driver); } |