From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Thu, 18 Jul 2013 06:23:57 +0200 Subject: [U-Boot] [PATCH v3 3/7] ARM: OMAP: USB: Fix linker error when ULPI is not defined In-Reply-To: <1374092167-27645-4-git-send-email-dmurphy@ti.com> References: <1374092167-27645-1-git-send-email-dmurphy@ti.com> <1374092167-27645-4-git-send-email-dmurphy@ti.com> Message-ID: <201307180623.57554.marex@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Dan Murphy, > Fix the linker error for missing ulpi_reset when ulpi is not defined > in the board config. > > Signed-off-by: Dan Murphy Acked-by: Marek Vasut > --- > v3 - No updates - http://patchwork.ozlabs.org/patch/258228/ > > drivers/usb/host/ehci-omap.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c > index 17f2214..bd7191c 100644 > --- a/drivers/usb/host/ehci-omap.c > +++ b/drivers/usb/host/ehci-omap.c > @@ -90,6 +90,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; > @@ -99,6 +100,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) > { Best regards, Marek Vasut