projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
arm926ejs
/
armada100
/
timer.c
diff --git
a/arch/arm/cpu/arm926ejs/armada100/timer.c
b/arch/arm/cpu/arm926ejs/armada100/timer.c
index f4962ec45f984de32ee5733e1efba8393a18adc1..0f1e68c8355f64c8303f2858562a3fdaf2cedf6c 100644
(file)
--- a/
arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/
arch/arm/cpu/arm926ejs/armada100/timer.c
@@
-8,9
+8,11
@@
#include <common.h>
#include <cpu_func.h>
#include <common.h>
#include <cpu_func.h>
+#include <init.h>
#include <time.h>
#include <asm/arch/cpu.h>
#include <asm/arch/armada100.h>
#include <time.h>
#include <asm/arch/cpu.h>
#include <asm/arch/armada100.h>
+#include <linux/delay.h>
/*
* Timer registers
/*
* Timer registers