From 7add126f4ec6268ab59f737dd8e97e1c8430130e Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Wed, 1 Dec 2010 13:48:54 +0200 Subject: [PATCH] --- yaml --- r: 226985 b: refs/heads/master c: 1ea7f352d832d5abe43d5e9198098acb4d611ba3 h: refs/heads/master i: 226983: cf6b4fd058142766e8fea5970370b711e7b11c1d v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-omap4panda.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4147d03d8471..d0185006d5d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 743411b3f3e96e8ac4cae73551a0a95392fed1ea +refs/heads/master: 1ea7f352d832d5abe43d5e9198098acb4d611ba3 diff --git a/trunk/arch/arm/mach-omap2/board-omap4panda.c b/trunk/arch/arm/mach-omap2/board-omap4panda.c index 1ecd0a6cefb7..3bf644deb8b8 100644 --- a/trunk/arch/arm/mach-omap2/board-omap4panda.c +++ b/trunk/arch/arm/mach-omap2/board-omap4panda.c @@ -377,9 +377,7 @@ static void __init omap4_panda_init(void) /* OMAP4 Panda uses internal transceiver so register nop transceiver */ usb_nop_xceiv_register(); omap4_ehci_init(); - /* FIXME: allow multi-omap to boot until musb is updated for omap4 */ - if (!cpu_is_omap44xx()) - usb_musb_init(&musb_board_data); + usb_musb_init(&musb_board_data); } static void __init omap4_panda_map_io(void)