diff mbox

[U-Boot,v4,3/7] ARM: OMAP: USB: Fix linker error when ULPI is not defined

Message ID 1375383962-10160-4-git-send-email-dmurphy@ti.com
State Accepted
Delegated to: Marek Vasut
Headers show

Commit Message

Dan Murphy Aug. 1, 2013, 7:05 p.m. UTC 
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>
---

v3 - No updates - http://patchwork.ozlabs.org/patch/258228/
v4 - No updates - http://patchwork.ozlabs.org/patch/259755/

 drivers/usb/host/ehci-omap.c |    7 +++++++
 1 file changed, 7 insertions(+)
diff mbox

Patch

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 1ab8edc..7dc4ff6 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -76,6 +76,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;
@@ -85,6 +86,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)
 {