diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2010-03-05 10:46:36 -0800 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-03-05 13:55:32 -0800 |
| commit | bc646f81bff16fbb813977d9b926b04a32acf8ce (patch) | |
| tree | 9f89635496736f1dcfa75be49c18daf585e2a393 | |
| parent | e017a62d01aa6c7d0253b15182669295f000fa03 (diff) | |
tegra: EHCI bus suspend/resume requires CONFIG_PM
If CONFIG_PM is not selected, don't compile EHCI bus suspend/resume.
Change-Id: Ia89612fa3d82dc671accc597e4d1ca05f56eaa5c
Reviewed-on: http://git-master/r/783
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>
| -rwxr-xr-x | drivers/usb/host/ehci-tegra.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index b2469e5fbab8..2784aa641e78 100755 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -290,6 +290,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); @@ -354,6 +355,7 @@ static int tegra_ehci_bus_resume(struct usb_hcd *hcd) } return err_status; } +#endif static const struct hc_driver tegra_ehci_hc_driver = { .description = hcd_name, @@ -374,8 +376,10 @@ static const struct hc_driver tegra_ehci_hc_driver = { .get_frame_number = ehci_get_frame, .hub_status_data = ehci_hub_status_data, .hub_control = tegra_ehci_hub_control, +#if defined(CONFIG_PM) .bus_suspend = tegra_ehci_bus_suspend, .bus_resume = tegra_ehci_bus_resume, +#endif .relinquish_port = ehci_relinquish_port, .port_handed_over = ehci_port_handed_over, }; @@ -525,7 +529,7 @@ static int tegra_ehci_remove(struct platform_device *pdev) return -EINVAL; NvDdkUsbPhyClose(pdata->hUsbPhy); - + iounmap(hcd->regs); usb_remove_hcd(hcd); |