diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 13:04:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 13:04:09 +1000 |
| commit | 6a72bdf793220e9ce0785992b575144249e921c8 (patch) | |
| tree | d5773c3a50e2832a5eda1d893ca66178eb9e6e87 /arch/arm/mach-integrator | |
| parent | 666d257e68ddeb98f09d7ca1e6a54f9af4d8094d (diff) | |
| parent | 6bc88533bcbdab0ed1d9cf38094dcccbc9d528bc (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/arm/kernel/Makefile
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-u300/timer.c
arch/x86/xen/time.c
drivers/clocksource/dw_apb_timer_of.c
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index a5b15c4e8def..d9e95e612fcb 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -41,6 +41,7 @@ #include <linux/stat.h> #include <linux/sys_soc.h> #include <linux/termios.h> +#include <linux/sched_clock.h> #include <mach/hardware.h> #include <mach/platform.h> @@ -48,7 +49,6 @@ #include <asm/setup.h> #include <asm/param.h> /* HZ */ #include <asm/mach-types.h> -#include <asm/sched_clock.h> #include <mach/lm.h> #include <mach/irqs.h> |