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: 3417591 Return-Path: X-Original-To: patchwork-linux-arm@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 8466B9F3E0 for ; Mon, 30 Dec 2013 05:09:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2B3F200F3 for ; Mon, 30 Dec 2013 05:09:35 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7ADB5200E9 for ; Mon, 30 Dec 2013 05:09:34 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VxV6G-0003HT-4X; Mon, 30 Dec 2013 05:09:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VxV6D-0000Qd-KF; Mon, 30 Dec 2013 05:09:09 +0000 Received: from mail-pd0-f182.google.com ([209.85.192.182]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VxV6A-0000QI-95 for linux-arm-kernel@lists.infradead.org; Mon, 30 Dec 2013 05:09:07 +0000 Received: by mail-pd0-f182.google.com with SMTP id v10so10898385pde.41 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:from:to:cc:subject:date:message-id; bh=rTsTiVOYGO1z3wf1VYZf0JWJTpNOkbzX/zYNwOZ0hNY=; b=F4pw5ovXn/BMu3bkLsZGjsm6YwEGycvHsQMvZYTjrFYUZ886EJWsiGG2WlxwqL/4OL ULtwdAG/U11Q7bSE9/X9i7R9jc8erkMYQ90POv3eBgmpo7P0YMTXyEuYUA51PazhgHNK QGF4RdY8VgALvmSu65dqOPZ+3M9rVS1f4iqPOmuxDwMUONnwpx8KXtHHJdVtpWqXhiul 6NmQu9tmoFRIKj1nME5gpCrKxtJ0NIvkcd7cwLwqaajSmQ+2iHeQBxs2N+6N6+HuVr9f Ct6ercCINtwG6a/ddTOigJFeQH6yAgwQoTRLiTsrDEUz5E/U6HAHviamccb2zyFb8E/f fOnA== X-Gm-Message-State: ALoCoQkpXZh8Z86OTzmj0rY+JQHmg34K70Mz5ofsilTqCaaNSi0I7L6t98ZdRkkBwkmPMpJzSVOY 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131230_000906_386605_0649BB57 X-CRM114-Status: GOOD ( 11.46 ) X-Spam-Score: -1.9 (-) Cc: trivial@kernel.org, pawel.moll@arm.com, patches@linaro.org, sachin.kamat@linaro.org, Viresh Kumar , Catalin Marinas X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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 */