From patchwork Mon Dec 30 05:04:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 22779 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F32B4218CC for ; Mon, 30 Dec 2013 05:08:37 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id uq1sf48966086igb.1 for ; Sun, 29 Dec 2013 21:08:37 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=rTsTiVOYGO1z3wf1VYZf0JWJTpNOkbzX/zYNwOZ0hNY=; b=eVDBSghCJ9L2iY7IKbrmifeHoXQ/oEzExKEuWrObWMNrS8qK5E23B6PhC8TVYR12l/ FCfY0ZtVS/CqvhmFJeM03nnX53B+volS26OZD05g27iqXP+/hOUXzPvPY5q8HHaJiTGy lrAtkXT/vTYY15Gtifk9b+RLzaHL8kliN5WAw36OIERnjHh5FCmSpyA+aplRt07VdBsh 2fAH4+WC1PhYseOvm/7v0lK+GaZO/5XMZFu8vvQRxi2d8Lu74GkD8V+WsSrBswUFSTIl +Q4uI1tZACbwd0ubyC3gvDtL+XXWB1CFh0SoL5flWYGYFs9+X+ehf4hMWfBKI0BtwvRL Ze+g== X-Gm-Message-State: ALoCoQm3WoQsgBH/8raKIBKvVdeiuq+7GORm7I3S/VN3ZsiQMgvxCK8GaIuDo/1BRczrd9ReeoM7 X-Received: by 10.182.158.4 with SMTP id wq4mr26423430obb.18.1388380116990; Sun, 29 Dec 2013 21:08:36 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.106.132 with SMTP id gu4ls3406562qeb.8.gmail; Sun, 29 Dec 2013 21:08:36 -0800 (PST) X-Received: by 10.220.116.136 with SMTP id m8mr32960vcq.77.1388380116877; Sun, 29 Dec 2013 21:08:36 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id bl10si16189582vcb.84.2013.12.29.21.08.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Dec 2013 21:08:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id if17so5038719vcb.5 for ; Sun, 29 Dec 2013 21:08:36 -0800 (PST) X-Received: by 10.220.99.72 with SMTP id t8mr34272152vcn.10.1388380116802; Sun, 29 Dec 2013 21:08:36 -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 ey3csp585627ved; Sun, 29 Dec 2013 21:08:36 -0800 (PST) X-Received: by 10.66.8.66 with SMTP id p2mr66017696paa.129.1388380115841; Sun, 29 Dec 2013 21:08:35 -0800 (PST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id j5si32317900pbs.301.2013.12.29.21.08.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Dec 2013 21:08:35 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.42; Received: by mail-pa0-f42.google.com with SMTP id lj1so11360996pab.1 for ; Sun, 29 Dec 2013 21:08:35 -0800 (PST) X-Received: by 10.68.130.39 with SMTP id ob7mr66723249pbb.63.1388380115430; Sun, 29 Dec 2013 21:08:35 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id k10sm8130751pbk.18.2013.12.29.21.08.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Dec 2013 21:08:34 -0800 (PST) From: Sachin Kamat To: linux-arm-kernel@lists.infradead.org Cc: pawel.moll@arm.com, trivial@kernel.org, sachin.kamat@linaro.org, patches@linaro.org, Viresh Kumar , Catalin Marinas Subject: [PATCH 1/1] arm: Trivial cleanup in sp810.h Date: Mon, 30 Dec 2013 10:34:57 +0530 Message-Id: <1388379897-30548-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 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.220.174 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 da660b4a3b15 ("arm: Move sp810.h to include/linux/amba/") 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 Cc: Viresh Kumar Cc: Catalin Marinas Acked-by: Viresh Kumar --- include/linux/amba/sp810.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/linux/amba/sp810.h b/include/linux/amba/sp810.h index 6636430dd0e6..c7df89f99115 100644 --- a/include/linux/amba/sp810.h +++ b/include/linux/amba/sp810.h @@ -1,6 +1,4 @@ /* - * arch/arm/include/asm/hardware/sp810.h - * * ARM PrimeXsys System Controller SP810 header file * * Copyright (C) 2009 ST Microelectronics @@ -11,8 +9,8 @@ * warranty of any kind, whether express or implied. */ -#ifndef __ASM_ARM_SP810_H -#define __ASM_ARM_SP810_H +#ifndef __AMBA_SP810_H +#define __AMBA_SP810_H #include @@ -61,4 +59,4 @@ static inline void sysctl_soft_reset(void __iomem *base) writel(0, base + SCSYSSTAT); } -#endif /* __ASM_ARM_SP810_H */ +#endif /* __AMBA_SP810_H */