From patchwork Mon Feb 21 13:58:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Koyamangalath, Abhilash" X-Patchwork-Id: 577621 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1LDwIXp011304 for ; Mon, 21 Feb 2011 13:58:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755807Ab1BUN6L (ORCPT ); Mon, 21 Feb 2011 08:58:11 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:43154 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753160Ab1BUN6K convert rfc822-to-8bit (ORCPT ); Mon, 21 Feb 2011 08:58:10 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p1LDw6jK019169 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 21 Feb 2011 07:58:08 -0600 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p1LDw6kI025725 for ; Mon, 21 Feb 2011 19:28:06 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Mon, 21 Feb 2011 19:28:06 +0530 From: "Koyamangalath, Abhilash" To: "linux-omap@vger.kernel.org" Date: Mon, 21 Feb 2011 19:28:05 +0530 Subject: gpio126: Multiple gpio paths (2) : CAM_STROBE & SDMMC1_DAT4 Thread-Topic: gpio126: Multiple gpio paths (2) : CAM_STROBE & SDMMC1_DAT4 Thread-Index: AcvRz1yaV+uC1lAmRei4pgl9Ikwemw== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 21 Feb 2011 13:58:19 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c index 440c98e..2517141 100644 --- a/arch/arm/mach-omap2/mux34xx.c +++ b/arch/arm/mach-omap2/mux34xx.c @@ -86,9 +86,6 @@ static struct omap_mux __initdata omap3_muxmodes[] = { _OMAP3_MUXENTRY(CAM_PCLK, 97, "cam_pclk", NULL, NULL, NULL, "gpio_97", "hw_dbg2", NULL, "safe_mode"), - _OMAP3_MUXENTRY(CAM_STROBE, 126, - "cam_strobe", NULL, NULL, NULL, - "gpio_126", "hw_dbg11", NULL, "safe_mode"), _OMAP3_MUXENTRY(CAM_VS, 95, "cam_vs", NULL, NULL, NULL, "gpio_95", "hw_dbg1", NULL, "safe_mode"), @@ -1299,7 +1296,7 @@ static struct omap_mux __initdata omap3_cbb_subset[] = {