diff options
| author | Dan Murphy <dmurphy@ti.com> | 2013-08-01 14:05:58 -0500 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2013-08-26 21:55:46 +0200 |
| commit | 120503f32e1dcad3069633d6319d5d6c37e65c08 (patch) | |
| tree | 02303ab61d4ae517f645744614aef697c03a92c8 | |
| parent | d3d037ae18c33a16e49630ce2adbc9fea1a680eb (diff) | |
| download | blackbird-obmc-uboot-120503f32e1dcad3069633d6319d5d6c37e65c08.tar.gz blackbird-obmc-uboot-120503f32e1dcad3069633d6319d5d6c37e65c08.zip | |
ARM: OMAP: USB: Fix linker error when ULPI is not defined
Fix the linker error for missing ulpi_reset when ulpi is not defined
in the board config.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Marek Vasut <marex@denx.de>
| -rw-r--r-- | drivers/usb/host/ehci-omap.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index ec24fe05a3..3c58f9e656 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -79,6 +79,7 @@ static void omap_usbhs_hsic_init(int port) writel(reg, &usbtll->channel_conf + port); } +#ifdef CONFIG_USB_ULPI static void omap_ehci_soft_phy_reset(int port) { struct ulpi_viewport ulpi_vp; @@ -88,6 +89,12 @@ static void omap_ehci_soft_phy_reset(int port) ulpi_reset(&ulpi_vp); } +#else +static void omap_ehci_soft_phy_reset(int port) +{ + return; +} +#endif inline int __board_usb_init(void) { |
