From: Alan Stern Date: Fri, 30 Aug 2013 14:46:00 +0000 (-0400) Subject: USB: fix build error when CONFIG_PM_SLEEP isn't enabled X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=94cc662c4bd9f8487d54262bbfc2307d9b1fc6b1;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git USB: fix build error when CONFIG_PM_SLEEP isn't enabled commit 9d8924297cd9c256c23c02abae40202563452453 upstream. This patch fixes a build error that occurs when CONFIG_PM is enabled and CONFIG_PM_SLEEP isn't: >> drivers/usb/host/ohci-pci.c:294:10: error: 'usb_hcd_pci_pm_ops' undeclared here (not in a function) .pm = &usb_hcd_pci_pm_ops Since the usb_hcd_pci_pm_ops structure is defined and used when CONFIG_PM is enabled, its declaration should not be protected by CONFIG_PM_SLEEP. Signed-off-by: Alan Stern Reported-by: kbuild test robot Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index f5f5c7dfda9..0fdff28d501 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -410,7 +410,7 @@ extern int usb_hcd_pci_probe(struct pci_dev *dev, extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM extern const struct dev_pm_ops usb_hcd_pci_pm_ops; #endif #endif /* CONFIG_PCI */