usb: musb: am35x: fix compile error when building am35x
authorFelipe Balbi <balbi@ti.com>
Mon, 2 May 2011 09:45:05 +0000 (12:45 +0300)
committerFelipe Balbi <balbi@ti.com>
Wed, 18 May 2011 10:39:47 +0000 (13:39 +0300)
am35x_musb_set_mode() was redefined. Fix it.

Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/omap_phy_internal.c
arch/arm/plat-omap/include/plat/usb.h

index ce7d5e6e41508c3708a64b9680566dce6933b9dc..d8a04848f3c42a013032f247e2ec5954a63e79f9 100644 (file)
@@ -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,
 };
 
index 05f6abc96b0d6032edfb3e2b21f85bc90099ba5d..eff6e248b562c2c370700ae7f6403c164b32728f 100644 (file)
@@ -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);
 
index 02b96c8f6a17cd687f63a5e439d44ba57f621339..17d3c939775c7164e2c246f8a150bb212bbb0647 100644 (file)
@@ -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,