diff options
author | Tony Lindgren <tony@atomide.com> | 2011-05-24 09:04:49 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 09:04:49 +0200 |
commit | b7679ab3f70482ff4b75a8c735c8224ebedb6020 (patch) | |
tree | 39fba8d730b08ce79090dab49851adffe13dc329 /arch/arm/mach-omap2/board-am3517evm.c | |
parent | Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next (diff) | |
parent | usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled (diff) | |
download | linux-b7679ab3f70482ff4b75a8c735c8224ebedb6020.tar.xz linux-b7679ab3f70482ff4b75a8c735c8224ebedb6020.zip |
Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 6c4706038808..be44147d911a 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -374,7 +374,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, }; |