Commit 9b506833 authored Aug 26, 2013 by Linus Torvalds

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

parents 83c425d2 d3474049

drivers/usb/host/ohci-pci.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}