Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6d28523 authored May 02, 2011 by Felipe Balbi

usb: musb: am35x: fix compile error when building am35x



am35x_musb_set_mode() was redefined. Fix it.

Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 1f158488

arch/arm/mach-omap2/board-am3517evm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -396,7 +396,7 @@ static struct omap_musb_board_data musb_board_data = {
		.power = 500,
		.set_phy_power = am35x_musb_phy_power,
		.clear_irq = am35x_musb_clear_irq,
		.set_mode = am35x_musb_set_mode,
		.set_mode = am35x_set_mode,
		.reset = am35x_musb_reset,
		};

arch/arm/mach-omap2/omap_phy_internal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ void am35x_musb_clear_irq(void)
		regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
		}

		void am35x_musb_set_mode(u8 musb_mode)
		void am35x_set_mode(u8 musb_mode)
		{
		u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);

arch/arm/plat-omap/include/plat/usb.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ extern int omap4430_phy_suspend(struct device *dev, int suspend);
		extern void am35x_musb_reset(void);
		extern void am35x_musb_phy_power(u8 on);
		extern void am35x_musb_clear_irq(void);
		extern void am35x_musb_set_mode(u8 musb_mode);
		extern void am35x_set_mode(u8 musb_mode);

		/*
		* FIXME correct answer depends on hmc_mode,