From patchwork Fri Dec 7 21:06:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 1851761 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 A515A3FC71 for ; Fri, 7 Dec 2012 21:10: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 1Th58F-0002ft-Lf; Fri, 07 Dec 2012 21:06:51 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Th589-0002dl-7c for linux-arm-kernel@lists.infradead.org; Fri, 07 Dec 2012 21:06:47 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 07 Dec 2012 21:06:42 +0000 Received: from e102109-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Fri, 7 Dec 2012 21:06:41 +0000 From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/7] arm: Move sp810.h to include/linux/amba/ Date: Fri, 7 Dec 2012 21:06:26 +0000 Message-Id: <1354914392-9634-2-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 1.7.12.3 In-Reply-To: <1354914392-9634-1-git-send-email-catalin.marinas@arm.com> References: <1354914392-9634-1-git-send-email-catalin.marinas@arm.com> X-OriginalArrivalTime: 07 Dec 2012 21:06:41.0654 (UTC) FILETIME=[C15C5160:01CDD4BE] X-MC-Unique: 112120721064202801 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121207_160645_496557_E6F791D4 X-CRM114-Status: GOOD ( 10.52 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [91.220.42.44 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Russell King 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Since it is now used by code under drivers/clk/ it makes sense for this file to be in a more generic location. This is required for building vexpress support on arm64. Signed-off-by: Catalin Marinas Acked-by: Viresh Kumar Acked-by: Pawel Moll Cc: Shiraz Hashim Cc: Russell King --- arch/arm/plat-spear/restart.c | 2 +- drivers/clk/versatile/clk-vexpress.c | 3 +-- {arch/arm/include/asm/hardware => include/linux/amba}/sp810.h | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename {arch/arm/include/asm/hardware => include/linux/amba}/sp810.h (100%) diff --git a/arch/arm/include/asm/hardware/sp810.h b/include/linux/amba/sp810.h similarity index 100% rename from arch/arm/include/asm/hardware/sp810.h rename to include/linux/amba/sp810.h diff --git a/arch/arm/plat-spear/restart.c b/arch/arm/plat-spear/restart.c index 4f99011..7d4616d 100644 --- a/arch/arm/plat-spear/restart.c +++ b/arch/arm/plat-spear/restart.c @@ -11,8 +11,8 @@ * warranty of any kind, whether express or implied. */ #include +#include #include -#include #include #include diff --git a/drivers/clk/versatile/clk-vexpress.c b/drivers/clk/versatile/clk-vexpress.c index c742ac7..4f83ff9 100644 --- a/drivers/clk/versatile/clk-vexpress.c +++ b/drivers/clk/versatile/clk-vexpress.c @@ -11,6 +11,7 @@ * Copyright (C) 2012 ARM Limited */ +#include #include #include #include @@ -18,8 +19,6 @@ #include #include -#include - static struct clk *vexpress_sp810_timerclken[4]; static DEFINE_SPINLOCK(vexpress_sp810_lock);