From patchwork Sun Aug 16 20:56:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 41889 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7GKuwiF014934 for ; Sun, 16 Aug 2009 20:56:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751836AbZHPU4z (ORCPT ); Sun, 16 Aug 2009 16:56:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753948AbZHPU4z (ORCPT ); Sun, 16 Aug 2009 16:56:55 -0400 Received: from mail-qy0-f196.google.com ([209.85.221.196]:40235 "EHLO mail-qy0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751836AbZHPU4y (ORCPT ); Sun, 16 Aug 2009 16:56:54 -0400 Received: by qyk34 with SMTP id 34so1904784qyk.33 for ; Sun, 16 Aug 2009 13:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=drxnA9pqaGd/K6XMfp9T3rCNZE0FY9SORd34UAlFcmo=; b=mGXCTZfFvImjUbHfrZo07dGH1iu9LqtI2X88eJN+v1Q1VA3sZVCTGwhZT8YbY9+6Tb BDJ5sAyMcCoV9EjVtV1kGLAMIdmw16z+W542K9Ov5vCLnaUQ/4IWeQ9Ufq+VXACEQ0la mCSz4gUf20tYp1OGfvQTArq2RtmX3rm8JPtsQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=eu3N9RdyRyJeIB3NZKe/P0ryGYqmA6Z9maJ8pLDEQDCuTlQ8z0l6TOjXVzfYSKU3HG e4VGkCguOOK1POxaUJbR3k/1Q4P6nz1d3tzlhSW6vIWVfKKtClale9TMOpLUT/Dnofqe eTeGHB0M63mkve1t3WS4IckGajz5U2IP52kzo= MIME-Version: 1.0 Received: by 10.229.2.42 with SMTP id 42mr1699328qch.101.1250456215390; Sun, 16 Aug 2009 13:56:55 -0700 (PDT) Date: Sun, 16 Aug 2009 13:56:55 -0700 Message-ID: <5e088bd90908161356j4d78fa1dn5e0f82f62bdd180d@mail.gmail.com> Subject: [PATCH] ARM: OMAP3: Overo: fix merge error From: Steve Sakoman To: linux-arm-kernel@lists.arm.linux.org.uk, linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Missing definition for OVERO_GPIO_PENDOWN Signed-off-by: Steve Sakoman --- arch/arm/mach-omap2/board-overo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 3fd614e..65bf008 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -51,6 +51,7 @@ #define OVERO_GPIO_BT_XGATE 15 #define OVERO_GPIO_W2W_NRESET 16 +#define OVERO_GPIO_PENDOWN 114 #define OVERO_GPIO_BT_NRESET 164 #define OVERO_GPIO_USBH_CPEN 168 #define OVERO_GPIO_USBH_NRESET 183