From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Wed, 19 Dec 2012 17:54:40 +0000 Subject: [PATCH v2 1/7] arm: Move sp810.h to include/linux/amba/ In-Reply-To: <1355939686-23728-1-git-send-email-catalin.marinas@arm.com> References: <1355939686-23728-1-git-send-email-catalin.marinas@arm.com> Message-ID: <1355939686-23728-2-git-send-email-catalin.marinas@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.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/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); 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