diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-08-30 10:46:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-30 11:12:06 -0700 |
| commit | 9d8924297cd9c256c23c02abae40202563452453 (patch) | |
| tree | e602b5cbbaad92b49be530f42d49cbb91df955dc /include/linux/usb | |
| parent | 9b1b0162e9aed89e2ac0a9f01157a6046b896337 (diff) | |
| download | op-kernel-dev-9d8924297cd9c256c23c02abae40202563452453.zip op-kernel-dev-9d8924297cd9c256c23c02abae40202563452453.tar.gz | |
USB: fix build error when CONFIG_PM_SLEEP isn't enabled
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@rowland.harvard.edu>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
CC: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/hcd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index a9c7d44..75efc45 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -428,7 +428,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 */ |
