aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/timer.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-08-13 11:35:55 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-08-13 13:53:06 +0200
commit234323ba4f226d9d3d90d5c30f7883362a810a20 (patch)
treeb27dd85e6a1730ac1bc7157fa3a63af8df43e19f /arch/arm/mach-u300/timer.c
parentpinctrl/coh901: move header to platform data dir (diff)
downloadlinux-dev-234323ba4f226d9d3d90d5c30f7883362a810a20.tar.xz
linux-dev-234323ba4f226d9d3d90d5c30f7883362a810a20.zip
ARM: u300: merge u300.c into core.c and rid headers
This gets rid of the separate u300.c file in mach-u300 since it can just as well live right in core.c, then we also get rid of the broadcasted <mach/platform.h> file that is not helping anyone. Put the interface to the system timer into a separate header. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/timer.c')
-rw-r--r--arch/arm/mach-u300/timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index 56ac06d38ec1..146e81531da3 100644
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -26,6 +26,8 @@
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
+#include "timer.h"
+
/*
* APP side special timer registers
* This timer contains four timers which can fire an interrupt each.