Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstul…

…tz/linux into timers/core
git-mirror · Jun 24, 2013 · 67c120d · 67c120d
2 parents 0647065 + 629a6a2
commit 67c120d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h
@@ -0,0 +1,4 @@
+/* You shouldn't include this file. Use linux/sched_clock.h instead.
+ * Temporary file until all asm/sched_clock.h users are gone
+ */
+#include <linux/sched_clock.h>