diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-06-25 01:30:51 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-06-25 01:30:51 +0200 |
commit | 67c120dc33831c1c9c9b36b4eca3323ba1f472a1 (patch) | |
tree | 0fde9f9c11671b82fe33b05b7787ad896c36776e | |
parent | 064706514ec3fea740c2656e03c4f01f6a551ac4 (diff) | |
parent | 629a6a2b7762a474177d08043bea094dd27e0a54 (diff) | |
download | linux-67c120dc33831c1c9c9b36b4eca3323ba1f472a1.tar.bz2 |
Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into timers/core
-rw-r--r-- | arch/arm/include/asm/sched_clock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h new file mode 100644 index 000000000000..2389b71a8e7c --- /dev/null +++ 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> |