---

yaml --- r: 184764 b: refs/heads/master c: ae46ec7 h: refs/heads/master v: v3
git-mirror · Feb 23, 2010 · 7a5b97d · 7a5b97d
1 parent f99cf69
commit 7a5b97d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83905c134571642d7e8a1e51ae9f26bd3a3ad82a
+refs/heads/master: ae46ec77311b550be992339c1e01fc20bc65296e
diff --git a/trunk/arch/arm/mach-omap2/board-4430sdp.c b/trunk/arch/arm/mach-omap2/board-4430sdp.c
@@ -87,7 +87,9 @@ static void __init omap_4430sdp_init(void)
 	omap_serial_init();
 	/* OMAP4 SDP uses internal transceiver so register nop transceiver */
 	usb_nop_xceiv_register();
-	usb_musb_init(&musb_board_data);
+	/* FIXME: allow multi-omap to boot until musb is updated for omap4 */
+	if (!cpu_is_omap44xx())
+		usb_musb_init(&musb_board_data);
 }
 
 static void __init omap_4430sdp_map_io(void)