diff options
author | Felipe Balbi <balbi@ti.com> | 2011-05-02 05:45:05 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-05-18 06:39:47 -0400 |
commit | a6d28523dbe6dc5bf3fc6a9078a69de6873c511e (patch) | |
tree | d66b21decbce41fd532e2238e0c1e31fd7862f41 /arch/arm | |
parent | 1f15848807c20762017da29fa1dac64fb67b8128 (diff) |
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 ce7d5e6e4150..d8a04848f3c4 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 = { | |||
396 | .power = 500, | 396 | .power = 500, |
397 | .set_phy_power = am35x_musb_phy_power, | 397 | .set_phy_power = am35x_musb_phy_power, |
398 | .clear_irq = am35x_musb_clear_irq, | 398 | .clear_irq = am35x_musb_clear_irq, |
399 | .set_mode = am35x_musb_set_mode, | 399 | .set_mode = am35x_set_mode, |
400 | .reset = am35x_musb_reset, | 400 | .reset = am35x_musb_reset, |
401 | }; | 401 | }; |
402 | 402 | ||
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index 05f6abc96b0d..eff6e248b562 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) | |||
228 | regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); | 228 | regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); |
229 | } | 229 | } |
230 | 230 | ||
231 | void am35x_musb_set_mode(u8 musb_mode) | 231 | void am35x_set_mode(u8 musb_mode) |
232 | { | 232 | { |
233 | u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2); | 233 | u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2); |
234 | 234 | ||
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 02b96c8f6a17..17d3c939775c 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); | |||
113 | extern void am35x_musb_reset(void); | 113 | extern void am35x_musb_reset(void); |
114 | extern void am35x_musb_phy_power(u8 on); | 114 | extern void am35x_musb_phy_power(u8 on); |
115 | extern void am35x_musb_clear_irq(void); | 115 | extern void am35x_musb_clear_irq(void); |
116 | extern void am35x_musb_set_mode(u8 musb_mode); | 116 | extern void am35x_set_mode(u8 musb_mode); |
117 | 117 | ||
118 | /* | 118 | /* |
119 | * FIXME correct answer depends on hmc_mode, | 119 | * FIXME correct answer depends on hmc_mode, |