lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 025/104] USB: fix build error when CONFIG_PM_SLEEP isn't enabled
    Date
    3.5.7.22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alan Stern <stern@rowland.harvard.edu>

    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@rowland.harvard.edu>
    Reported-by: kbuild test robot <fengguang.wu@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    include/linux/usb/hcd.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
    index 49b3ac2..aed9773 100644
    --- a/include/linux/usb/hcd.h
    +++ b/include/linux/usb/hcd.h
    @@ -402,7 +402,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 */
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-09-30 13:21    [W:4.133 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site