From patchwork Fri Apr 1 06:52:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luciano Coelho X-Patchwork-Id: 680581 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 p316q1GP019761 for ; Fri, 1 Apr 2011 06:52:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754658Ab1DAGwA (ORCPT ); Fri, 1 Apr 2011 02:52:00 -0400 Received: from na3sys009aog117.obsmtp.com ([74.125.149.242]:40857 "EHLO na3sys009aog117.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754512Ab1DAGwA (ORCPT ); Fri, 1 Apr 2011 02:52:00 -0400 Received: from source ([209.85.215.50]) (using TLSv1) by na3sys009aob117.postini.com ([74.125.148.12]) with SMTP ID DSNKTZV2D980rBxPtjm+5zghltFNviLx+Zsr@postini.com; Thu, 31 Mar 2011 23:51:59 PDT Received: by ewy10 with SMTP id 10so920607ewy.9 for ; Thu, 31 Mar 2011 23:51:57 -0700 (PDT) Received: by 10.213.114.3 with SMTP id c3mr123760ebq.126.1301640715919; Thu, 31 Mar 2011 23:51:55 -0700 (PDT) Received: from localhost.localdomain (a88-113-230-203.elisa-laajakaista.fi [88.113.230.203]) by mx.google.com with ESMTPS id w59sm1209989eeh.3.2011.03.31.23.51.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 31 Mar 2011 23:51:55 -0700 (PDT) From: Luciano Coelho To: Tony Lindgren Cc: linux-omap@vger.kernel.org, Kishore Kadiyala , Benoit Cousson Subject: [PATCH 2.6.39] omap: board-4430sdp: revert hsmmc_info reordering Date: Fri, 1 Apr 2011 09:52:28 +0300 Message-Id: <1301640748-17161-1-git-send-email-coelho@ti.com> X-Mailer: git-send-email 1.7.1 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]); Fri, 01 Apr 2011 06:52:02 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 56702c5..8991d56 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -351,6 +351,11 @@ static struct twl4030_usb_data omap4_usbphy_data = { static struct omap2_hsmmc_info mmc[] = { { + .mmc = 1, + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, + .gpio_wp = -EINVAL, + }, + { .mmc = 2, .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, .gpio_cd = -EINVAL, @@ -358,11 +363,6 @@ static struct omap2_hsmmc_info mmc[] = { .nonremovable = true, .ocr_mask = MMC_VDD_29_30, }, - { - .mmc = 1, - .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, - .gpio_wp = -EINVAL, - }, {} /* Terminator */ };