From: Allen Martin Date: Fri, 19 Nov 2010 22:15:34 +0000 (-0800) Subject: usb: host: tegra: protect bus suspend with CONFIG_PM X-Git-Tag: firefly_0821_release~9833^2~100^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b8f8a55f11c9774c3b84bdc212535525dc9148e;p=firefly-linux-kernel-4.4.55.git usb: host: tegra: protect bus suspend with CONFIG_PM Protect the bus suspend/resume functions behind #ifdef CONFIG_PM. This prevents a compile error if CONFIG_PM is turned off. Signed-off-by: Allen Martin Signed-off-by: Colin Cross --- diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index e3b01b39fc3f..60db07950528 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -415,6 +415,7 @@ static int tegra_ehci_setup(struct usb_hcd *hcd) return retval; } +#ifdef CONFIG_PM static int tegra_ehci_bus_suspend(struct usb_hcd *hcd) { struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller); @@ -442,6 +443,7 @@ static int tegra_ehci_bus_resume(struct usb_hcd *hcd) tegra->port_resuming = 1; return ehci_bus_resume(hcd); } +#endif static const struct hc_driver tegra_ehci_hc_driver = { .description = hcd_name,