aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress
diff options
context:
space:
mode:
authorRob Herring <r.herring@freescale.com>2010-10-06 11:18:08 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-04 11:49:32 -0400
commit8a9618f5dfca35edb0d7ab6374ff586e2e9e989b (patch)
tree0104c5a164af6f750aee1dd2e86c6c0b333d004a /arch/arm/mach-vexpress
parentff8b16d7e15a8ba2a6086645614a483e048e3fbf (diff)
ARM: 6432/1: move timer-sp.c from versatile to common
From: Rob Herring <rob.herring@smooth-stone.com> The timer-sp h/w used on versatile platforms can also be used for other platforms, so move it to a common location. Signed-off-by: Rob Herring <rob.herring@smooth-stone.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r--arch/arm/mach-vexpress/ct-ca9x4.c2
-rw-r--r--arch/arm/mach-vexpress/v2m.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index c2e405a9e025..101e79fd5ab6 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -21,7 +21,7 @@
21#include <mach/clkdev.h> 21#include <mach/clkdev.h>
22#include <mach/ct-ca9x4.h> 22#include <mach/ct-ca9x4.h>
23 23
24#include <plat/timer-sp.h> 24#include <asm/hardware/timer-sp.h>
25 25
26#include <asm/mach/arch.h> 26#include <asm/mach/arch.h>
27#include <asm/mach/map.h> 27#include <asm/mach/map.h>
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 7eaa232180a5..91ff2e0df856 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -22,7 +22,7 @@
22#include <mach/clkdev.h> 22#include <mach/clkdev.h>
23#include <mach/motherboard.h> 23#include <mach/motherboard.h>
24 24
25#include <plat/timer-sp.h> 25#include <asm/hardware/timer-sp.h>
26 26
27#include "core.h" 27#include "core.h"
28 28