]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: OMAP: USB: Fix linker error when ULPI is not defined
authorDan Murphy <dmurphy@ti.com>
Thu, 1 Aug 2013 19:05:58 +0000 (14:05 -0500)
committerMarek Vasut <marex@denx.de>
Mon, 26 Aug 2013 19:55:46 +0000 (21:55 +0200)
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>
drivers/usb/host/ehci-omap.c

index ec24fe05a3f28f6c1bd3a478f1baa128c2bc5115..3c58f9e656c6d1a2dbe5a2bd103dfbe623a96eb2 100644 (file)
@@ -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)
 {