summaryrefslogtreecommitdiff
path: root/arch/arm/plat-versatile/include/plat/sched_clock.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 21:09:03 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 21:09:03 +0300
commit58daf18cdcab550262a5f4681e1f1e073e21965a (patch)
tree2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/plat-versatile/include/plat/sched_clock.h
parentaa312be1987d43216e72ffce42bccf6bf81f62ed (diff)
parent0af85dda39d9b673aca8c0ebae004ea70f3efc93 (diff)
downloadlinux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.xz
Merge branch 'clksrc' into devel
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile
Diffstat (limited to 'arch/arm/plat-versatile/include/plat/sched_clock.h')
-rw-r--r--arch/arm/plat-versatile/include/plat/sched_clock.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-versatile/include/plat/sched_clock.h b/arch/arm/plat-versatile/include/plat/sched_clock.h
new file mode 100644
index 000000000000..5c3e4fc9fa0c
--- /dev/null
+++ b/arch/arm/plat-versatile/include/plat/sched_clock.h
@@ -0,0 +1,6 @@
+#ifndef ARM_PLAT_SCHED_CLOCK_H
+#define ARM_PLAT_SCHED_CLOCK_H
+
+void versatile_sched_clock_init(void __iomem *, unsigned long);
+
+#endif