diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-05-24 03:04:49 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 03:04:49 -0400 |
| commit | b7679ab3f70482ff4b75a8c735c8224ebedb6020 (patch) | |
| tree | 39fba8d730b08ce79090dab49851adffe13dc329 /arch/arm/plat-omap | |
| parent | b08827f4c7a5020855abe0f9b1a316f11275b76b (diff) | |
| parent | 208466dc10083e734a8af71d10f923ee4bff950c (diff) | |
Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
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, |