aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-05-24 00:04:49 -0700
committerTony Lindgren <tony@atomide.com>2011-05-24 00:04:49 -0700
commitb7679ab3f70482ff4b75a8c735c8224ebedb6020 (patch)
tree39fba8d730b08ce79090dab49851adffe13dc329 /arch/arm/plat-omap
parentb08827f4c7a5020855abe0f9b1a316f11275b76b (diff)
parent208466dc10083e734a8af71d10f923ee4bff950c (diff)
downloadkernel_samsung_espresso10-b7679ab3f70482ff4b75a8c735c8224ebedb6020.zip
kernel_samsung_espresso10-b7679ab3f70482ff4b75a8c735c8224ebedb6020.tar.gz
kernel_samsung_espresso10-b7679ab3f70482ff4b75a8c735c8224ebedb6020.tar.bz2
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.h2
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 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,