Skip to content

Commit

Permalink
arm: Move sp810.h to include/linux/amba/
Browse files Browse the repository at this point in the history
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 <catalin.marinas@arm.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
  • Loading branch information
Catalin Marinas authored and Pawel Moll committed Jan 30, 2013
1 parent 949db15 commit da660b4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/arm/plat-spear/restart.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* warranty of any kind, whether express or implied.
*/
#include <linux/io.h>
#include <linux/amba/sp810.h>
#include <asm/system_misc.h>
#include <asm/hardware/sp810.h>
#include <mach/spear.h>
#include <mach/generic.h>

Expand Down
3 changes: 1 addition & 2 deletions drivers/clk/versatile/clk-vexpress.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
* Copyright (C) 2012 ARM Limited
*/

#include <linux/amba/sp810.h>
#include <linux/clkdev.h>
#include <linux/clk-provider.h>
#include <linux/err.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/vexpress.h>

#include <asm/hardware/sp810.h>

static struct clk *vexpress_sp810_timerclken[4];
static DEFINE_SPINLOCK(vexpress_sp810_lock);

Expand Down
File renamed without changes.

0 comments on commit da660b4

Please sign in to comment.