[PATCH 02/11] omap: musb: Remove #ifdef from board-omap3evm.c

Tony Lindgren tony at atomide.com
Fri Feb 19 18:30:08 EST 2010


From: Maulik Mankad <x0082077 at ti.com>

This patch removes #ifdef around usb_nop_xceiv_register()
from board-omap3evm.c

Signed-off-by: Maulik Mankad <x0082077 at ti.com>
Acked-by: Olof Johansson <olof at lixom.net>
Acked-by: Felipe Balbi <felipe.balbi at nokia.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Tony Lindgren <tony at atomide.com>
---
 arch/arm/mach-omap2/board-omap3evm.c |    4 ++--
 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 fa1f9d5..57506da 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)
 				ARRAY_SIZE(omap3evm_spi_board_info));
 
 	omap_serial_init();
-#ifdef CONFIG_NOP_USB_XCEIV
+
 	/* OMAP3EVM uses ISP1504 phy and so register nop transceiver */
 	usb_nop_xceiv_register();
-#endif
+
 	if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) {
 		/* enable EHCI VBUS using GPIO22 */
 		omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP);




More information about the linux-arm-kernel mailing list