Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756584Ab3HZOxz (ORCPT ); Mon, 26 Aug 2013 10:53:55 -0400 Received: from iolanthe.rowland.org ([192.131.102.54]:59113 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752006Ab3HZOxy (ORCPT ); Mon, 26 Aug 2013 10:53:54 -0400 Date: Mon, 26 Aug 2013 10:53:53 -0400 (EDT) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Greg Kroah-Hartman cc: Guenter Roeck , Meelis Roos , "linux-kernel@vger.kernel.org" , Linus Torvalds , Steve Cotton , USB list Subject: [PATCH] USB: OHCI: fix build error related to ohci_suspend/resume In-Reply-To: <20130826042653.GA2778@kroah.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1266 Lines: 42 Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled. This patch adds a preprocessor conditional to avoid build errors when PM is disabled. Signed-off-by: Alan Stern --- [as1702] drivers/usb/host/ohci-pci.c | 2 ++ 1 file changed, 2 insertions(+) Index: usb-3.11/drivers/usb/host/ohci-pci.c =================================================================== --- usb-3.11.orig/drivers/usb/host/ohci-pci.c +++ usb-3.11/drivers/usb/host/ohci-pci.c @@ -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); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/