diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-05-02 09:45:05 (GMT) |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-05-18 10:39:47 (GMT) |
| commit | a6d28523dbe6dc5bf3fc6a9078a69de6873c511e (patch) | |
| tree | d66b21decbce41fd532e2238e0c1e31fd7862f41 /arch/arm | |
| parent | 1f15848807c20762017da29fa1dac64fb67b8128 (diff) | |
| download | linux-fsl-qoriq-a6d28523dbe6dc5bf3fc6a9078a69de6873c511e.tar.xz | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_phy_internal.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/usb.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index ce7d5e6..d8a0484 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -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, }; diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index 05f6abc..eff6e24 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c @@ -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); diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 02b96c8..17d3c93 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h @@ -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, |