From patchwork Wed Sep 19 21:06:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 1481321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D1EB03FE65 for ; Wed, 19 Sep 2012 21:21:49 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TERfK-0003q0-F1; Wed, 19 Sep 2012 21:18:39 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TERTm-0003ke-7R for linux-arm-kernel@lists.infradead.org; Wed, 19 Sep 2012 21:06:44 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=[192.168.111.8]) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TERTl-000Cmo-Tl; Wed, 19 Sep 2012 21:06:42 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18U0iT0i1h39lQV1f6Q88GW Subject: [PATCH 29/29] ARM: OMAP2+: Make omap4-keypad.h local To: linux-arm-kernel@lists.infradead.org From: Tony Lindgren Date: Wed, 19 Sep 2012 14:06:41 -0700 Message-ID: <20120919210641.28074.51565.stgit@muffinssi> In-Reply-To: <20120919205732.28074.43697.stgit@muffinssi> References: <20120919205732.28074.43697.stgit@muffinssi> User-Agent: StGit/0.16-2-g0d85 MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-omap@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-4430sdp.c | 2 +- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/omap4-keypad.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/{plat-omap/include/plat/omap4-keypad.h => mach-omap2/omap4-keypad.h} (100%) diff --git a/arch/arm/plat-omap/include/plat/omap4-keypad.h b/arch/arm/mach-omap2/omap4-keypad.h similarity index 100% rename from arch/arm/plat-omap/include/plat/omap4-keypad.h rename to arch/arm/mach-omap2/omap4-keypad.h diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index dd4c88d..9066b7b 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -36,7 +36,7 @@ #include "common.h" #include #include -#include +#include "omap4-keypad.h" #include