From: Tony Lindgren <tony@atomide.com>
Date: Tue, 24 May 2011 07:04:49 +0000 (-0700)
Subject: Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b7679ab3f70482ff4b75a8c735c8224ebedb6020;p=linux-beck.git

Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into omap-for-linus
---

b7679ab3f70482ff4b75a8c735c8224ebedb6020
diff --cc arch/arm/mach-omap2/usb-musb.c
index dfa5a3cb5a17,fd95e62e8fcf..c7ed540d868d
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@@ -122,18 -116,7 +122,13 @@@ void __init usb_musb_init(struct omap_m
  	struct device			*dev;
  	int				bus_id = -1;
  	const char			*oh_name, *name;
 +	struct omap_musb_board_data	*board_data;
 +
 +	if (musb_board_data)
 +		board_data = musb_board_data;
 +	else
 +		board_data = &musb_default_board_data;
  
- 	if (cpu_is_omap3517() || cpu_is_omap3505()) {
- 	} else if (cpu_is_omap44xx()) {
- 		usb_musb_mux_init(board_data);
- 	}
- 
  	/*
  	 * REVISIT: This line can be removed once all the platforms using
  	 * musb_core.c have been converted to use use clkdev.