This is a note to let you know that I've just added the patch titled USB: fix build error when CONFIG_PM_SLEEP isn't enabled to the 3.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-fix-build-error-when-config_pm_sleep-isn-t-enabled.patch and it can be found in the queue-3.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 9d8924297cd9c256c23c02abae40202563452453 Mon Sep 17 00:00:00 2001 From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> Date: Fri, 30 Aug 2013 10:46:00 -0400 Subject: USB: fix build error when CONFIG_PM_SLEEP isn't enabled From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> 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 <stern@xxxxxxxxxxxxxxxxxxx> Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/linux/usb/hcd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -411,7 +411,7 @@ extern int usb_hcd_pci_probe(struct pci_ 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 */ Patches currently in stable-queue which might be from stern@xxxxxxxxxxxxxxxxxxx are queue-3.11/usb-ohci-allow-runtime-pm-without-system-sleep.patch queue-3.11/usb-don-t-fail-port-power-resume-on-device-disconnect.patch queue-3.11/usb-handle-lpm-errors-during-device-suspend-correctly.patch queue-3.11/scsi-sd-fix-potential-out-of-bounds-access.patch queue-3.11/usb-fix-build-error-when-config_pm_sleep-isn-t-enabled.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html