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: 3411901 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8FA569F374 for ; Fri, 27 Dec 2013 12:06:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7133B20161 for ; Fri, 27 Dec 2013 12:06:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4625920165 for ; Fri, 27 Dec 2013 12:06:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754463Ab3L0MGt (ORCPT ); Fri, 27 Dec 2013 07:06:49 -0500 Received: from mail-pb0-f48.google.com ([209.85.160.48]:36247 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754457Ab3L0MGn (ORCPT ); Fri, 27 Dec 2013 07:06:43 -0500 Received: by mail-pb0-f48.google.com with SMTP id md12so9170729pbc.21 for ; Fri, 27 Dec 2013 04:06:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9JlY+Sp6TPPEbIgijeKXCOY6pH/PQ4uOgLHJTsD0V5M=; b=AGDtz9N6xXE9NK2lppZWjunvSfmSLRsW+XTgWrpZJo59LH5JXuUQyW+BQ3GtgcuYn0 vFhj32CpL7KvcEtwbOq3KwhjHUaRlsN2Vfk3y9ZzRcgSH2LzE4LCnVlPiiVswyjTZiff nB0qSPrThLXhx9KTpDXcDkuY3HanYI9BDNk7sdXWFPRz42goE8Y10RQxLBeoWU204WXo Y/XCjHrKmSYjmvQbKoBg3cNGbVA3jnoTrn45VDL9PMJAwa4HSvJ8tLCqB5UyoZGakuVf jJOrXd0ypQ6kh/1oiCWKb6soKdLEhqYUcJB0J25dEj3ncYjbLDGorX4YK2Zasnr0EIaf hwGA== X-Gm-Message-State: ALoCoQliLdBcCQHDzNNaX1D7cG/SV0vGEPVIZM3VfmYcBdLpYzCi6ndrxlNcUnvTtNKdhf+M0EhA 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> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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