summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mmp
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-06-01 23:39:40 -0700
committerAjay Nandakumar <anandakumarm@nvidia.com>2014-01-13 12:03:37 +0530
commit9677b59f55e348c330eeb8cd9a6f7b2f613839a5 (patch)
tree51c4e85fb28b3915e3446b142881ce0bcb908e1b /arch/arm/mach-mmp
parent8ec79f015299aafb8e44095545a4e2656e6992c9 (diff)
sched_clock: Make ARM's sched_clock generic for all architectures
Nothing about the sched_clock implementation in the ARM port is specific to the architecture. Generalize the code so that other architectures can use it by selecting GENERIC_SCHED_CLOCK. Bug 1399318 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> [jstultz: Merge minor collisions with other patches in my tree] Signed-off-by: John Stultz <john.stultz@linaro.org> (cherry picked from commit 38ff87f77af0b5a93fc8581cff1d6e5692ab8970) Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com> Change-Id: Iaac325635344ef4adee8fa0f9ca11aee089bce0f
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r--arch/arm/mach-mmp/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index 86a18b3d252e..7ac41e83cfef 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -28,8 +28,8 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
+#include <linux/sched_clock.h>
-#include <asm/sched_clock.h>
#include <mach/addr-map.h>
#include <mach/regs-timers.h>
#include <mach/regs-apbc.h>