From patchwork Fri Dec 27 12:03:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 22762 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 02235202E4 for ; Fri, 27 Dec 2013 12:06:45 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id uy17sf38512010igb.0 for ; Fri, 27 Dec 2013 04:06:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=9JlY+Sp6TPPEbIgijeKXCOY6pH/PQ4uOgLHJTsD0V5M=; b=YGWArjqROplUsdlfy22rHw8mLiPx8ki/sEfwY66DNEp34U5+xkHHgHduMB3JXFXV84 gVFTc2BgQDX9oJbN4+GZfxsHuZJCBvEme1LNk7Z19unGBPZ83d3Sl4Nb/ldH+Mz/75Ni WKDeLiNghU3v7OzQYlPU+C/B3hjDgOhWNezIT4h7rv/j//BOn5GvgaNqV4/5QLZKeWeh uHzX5CI3ML1D14AEltWtxom/y9LWUvyBTlmCjGMaLvBYA4PJYCez8rmgtsrKipJuzR26 dlrEHFBBBHIHL2ctRkUZvMNJc0OlMj/CzAtW7CWQcJRvviEof5qOL/6BPtYeZYHnit8j 8wMA== X-Gm-Message-State: ALoCoQl++6FL+GQrWA4W+pqn57nZqnUTxVuvR1fgq3f0vPemUQnavQpcFzuBajpmWegpptUgVA/2 X-Received: by 10.42.84.136 with SMTP id m8mr18024133icl.9.1388146005064; Fri, 27 Dec 2013 04:06:45 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.106.70 with SMTP id gs6ls2771372qeb.17.gmail; Fri, 27 Dec 2013 04:06:45 -0800 (PST) X-Received: by 10.221.37.200 with SMTP id tf8mr4449868vcb.54.1388146004955; Fri, 27 Dec 2013 04:06:44 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id ed9si10589259vcb.81.2013.12.27.04.06.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Dec 2013 04:06:44 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oz11so4751374veb.4 for ; Fri, 27 Dec 2013 04:06:44 -0800 (PST) X-Received: by 10.58.54.69 with SMTP id h5mr7344568vep.25.1388146004810; Fri, 27 Dec 2013 04:06:44 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp452816ved; Fri, 27 Dec 2013 04:06:44 -0800 (PST) X-Received: by 10.67.22.67 with SMTP id hq3mr49959287pad.132.1388146003825; Fri, 27 Dec 2013 04:06:43 -0800 (PST) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by mx.google.com with ESMTPS id xu5si24175081pab.51.2013.12.27.04.06.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Dec 2013 04:06:43 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.48 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.48; Received: by mail-pa0-f48.google.com with SMTP id rd3so9235806pab.21 for ; Fri, 27 Dec 2013 04:06:43 -0800 (PST) X-Received: by 10.68.189.34 with SMTP id gf2mr49935448pbc.91.1388146003327; Fri, 27 Dec 2013 04:06:43 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id nw11sm80709361pab.13.2013.12.27.04.06.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Dec 2013 04:06:41 -0800 (PST) From: Sachin Kamat To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, dtor@mail.ru, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 2/2] Input: keypad-omap - Cleanup header file Date: Fri, 27 Dec 2013 17:33:08 +0530 Message-Id: <1388145788-6253-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1388145788-6253-1-git-send-email-sachin.kamat@linaro.org> References: <1388145788-6253-1-git-send-email-sachin.kamat@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 2203747c9771 ("ARM: omap: move platform_data definitions") moved the file to the current location but forgot to remove the pointer to its previous location. Clean it up. While at it also change the header file protection macros appropriately. Signed-off-by: Sachin Kamat --- include/linux/platform_data/keypad-omap.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h index a6b21eddb212..c3a3abae98f0 100644 --- a/include/linux/platform_data/keypad-omap.h +++ b/include/linux/platform_data/keypad-omap.h @@ -1,14 +1,12 @@ /* - * arch/arm/plat-omap/include/mach/keypad.h - * * Copyright (C) 2006 Komal Shah * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef ASMARM_ARCH_KEYPAD_H -#define ASMARM_ARCH_KEYPAD_H +#ifndef __KEYPAD_OMAP_H +#define __KEYPAD_OMAP_H #ifndef CONFIG_ARCH_OMAP1 #warning Please update the board to use matrix-keypad driver