aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3evm.c
diff options
context:
space:
mode:
authorMaulik Mankad <x0082077@ti.com>2010-02-17 17:09:29 -0500
committerTony Lindgren <tony@atomide.com>2010-02-19 18:22:17 -0500
commit1a4f4637492f6a5977dd21b0026da09cd269c4a9 (patch)
treeae5a83d54b47a0d60868c31d77539f18211c902c /arch/arm/mach-omap2/board-omap3evm.c
parent224e1542b6ca2d38dc0c7ea65fb6760c082b1309 (diff)
omap: musb: Remove #ifdef from board-omap3evm.c
This patch removes #ifdef around usb_nop_xceiv_register() from board-omap3evm.c Signed-off-by: Maulik Mankad <x0082077@ti.com> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index fa1f9d5181ed..57506da4e433 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -675,10 +675,10 @@ static void __init omap3_evm_init(void)
675 ARRAY_SIZE(omap3evm_spi_board_info)); 675 ARRAY_SIZE(omap3evm_spi_board_info));
676 676
677 omap_serial_init(); 677 omap_serial_init();
678#ifdef CONFIG_NOP_USB_XCEIV 678
679 /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */ 679 /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */
680 usb_nop_xceiv_register(); 680 usb_nop_xceiv_register();
681#endif 681
682 if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) { 682 if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) {
683 /* enable EHCI VBUS using GPIO22 */ 683 /* enable EHCI VBUS using GPIO22 */
684 omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP); 684 omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP);