mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-14 06:35:12 +00:00
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>
This commit is contained in:
parent
1f15848807
commit
a6d28523db
3 changed files with 3 additions and 3 deletions
|
@ -396,7 +396,7 @@ static struct omap_musb_board_data musb_board_data = {
|
||||||
.power = 500,
|
.power = 500,
|
||||||
.set_phy_power = am35x_musb_phy_power,
|
.set_phy_power = am35x_musb_phy_power,
|
||||||
.clear_irq = am35x_musb_clear_irq,
|
.clear_irq = am35x_musb_clear_irq,
|
||||||
.set_mode = am35x_musb_set_mode,
|
.set_mode = am35x_set_mode,
|
||||||
.reset = am35x_musb_reset,
|
.reset = am35x_musb_reset,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -228,7 +228,7 @@ void am35x_musb_clear_irq(void)
|
||||||
regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
|
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);
|
u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@ extern int omap4430_phy_suspend(struct device *dev, int suspend);
|
||||||
extern void am35x_musb_reset(void);
|
extern void am35x_musb_reset(void);
|
||||||
extern void am35x_musb_phy_power(u8 on);
|
extern void am35x_musb_phy_power(u8 on);
|
||||||
extern void am35x_musb_clear_irq(void);
|
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,
|
* FIXME correct answer depends on hmc_mode,
|
||||||
|
|
Loading…
Reference in a new issue