diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
| commit | 72249651843f93d50c302833546fb2880052a80f (patch) | |
| tree | 172a8af74ce161bc276856d7331dc0076055093c /arch/arm/plat-mxc/global_timer.c | |
| parent | aef4075a0bcc7860eafa17be0c6e6cfcecc68206 (diff) | |
| parent | 50c4c848d6b8743894cfcec166db475ef6140504 (diff) | |
Merge tag '3.0-vybrid-ts2.13' into colibri_vfColibri_VF_LinuxImageV2.1Beta3_20140318
3.0-vybrid-ts2.13
Diffstat (limited to 'arch/arm/plat-mxc/global_timer.c')
| -rw-r--r-- | arch/arm/plat-mxc/global_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/global_timer.c b/arch/arm/plat-mxc/global_timer.c index 607c861d2752..abbccb955af3 100644 --- a/arch/arm/plat-mxc/global_timer.c +++ b/arch/arm/plat-mxc/global_timer.c @@ -18,6 +18,7 @@ #include <linux/cpufreq.h> #include <linux/err.h> #include <linux/seq_file.h> +#include <linux/ftrace.h> #include <asm/sched_clock.h> #include <asm/hardware/gic.h> |