From patchwork Mon Jan 4 11:11:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maulik Mankad X-Patchwork-Id: 70620 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o04BBUgl026473 for ; Mon, 4 Jan 2010 11:11:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753396Ab0ADLL1 (ORCPT ); Mon, 4 Jan 2010 06:11:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753371Ab0ADLL1 (ORCPT ); Mon, 4 Jan 2010 06:11:27 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:36770 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753366Ab0ADLL0 (ORCPT ); Mon, 4 Jan 2010 06:11:26 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o04BB67X025192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 4 Jan 2010 05:11:08 -0600 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o04BB5jJ027261; Mon, 4 Jan 2010 16:41:05 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id o04BB4bO013152; Mon, 4 Jan 2010 16:41:04 +0530 Received: (from x0082077@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o04BB4a1013149; Mon, 4 Jan 2010 16:41:04 +0530 From: Maulik Mankad To: linux-omap@vger.kernel.org Cc: linux-usb@vger.kernel.org, Maulik Mankad , Tony Lindgren , Felipe Balbi , Greg Kroah-Hartman , Olof Johansson , "Gupta, Ajay Kumar" Subject: [PATCH v2 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c Date: Mon, 4 Jan 2010 16:41:04 +0530 Message-Id: <1262603464-13117-1-git-send-email-x0082077@ti.com> X-Mailer: git-send-email 1.5.5 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Index: felipe_musb/arch/arm/mach-omap2/board-omap3evm.c =================================================================== --- felipe_musb.orig/arch/arm/mach-omap2/board-omap3evm.c +++ felipe_musb/arch/arm/mach-omap2/board-omap3evm.c @@ -444,10 +444,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);