From 283d990f999660b588ccfc917b197656ab72742d Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Fri, 11 Jun 2010 12:11:11 -0700 Subject: tegra: EHCI bus suspend/resume requires CONFIG_PM Change-Id: I86faa2f56dbfd0ed145f40b04346a85f64bab12c Reviewed-on: http://git-master/r/2508 Reviewed-by: Scott Williams Tested-by: Scott Williams Reviewed-by: Gary King --- drivers/usb/host/ehci-tegra.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 3db4599b7a62..d971d0595e01 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -153,6 +153,7 @@ static int tegra_ehci_hub_control ( return retval; } +#if defined(CONFIG_USB_OTG_UTILS) || defined(CONFIG_PM) static void tegra_ehci_restart (struct usb_hcd *hcd) { unsigned int temp; @@ -185,6 +186,7 @@ static void tegra_ehci_restart (struct usb_hcd *hcd) /* Turn On Interrupts */ ehci_writel(ehci, INTR_MASK, &ehci->regs->intr_enable); } +#endif static void tegra_ehci_shutdown (struct usb_hcd *hcd) { @@ -329,7 +331,7 @@ static int tegra_ehci_setup(struct usb_hcd *hcd) return retval; } - +#if defined(CONFIG_PM) static int tegra_ehci_bus_suspend(struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); @@ -400,6 +402,7 @@ static int tegra_ehci_bus_resume(struct usb_hcd *hcd) return ehci_bus_resume(hcd); } +#endif static int tegra_ehci_urb_enqueue( struct usb_hcd *hcd, -- cgit v1.2.3