summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rix <Tom.Rix@windriver.com>2009-10-04 16:57:09 -0500
committerTom Rix <Tom.Rix@windriver.com>2009-10-04 16:57:09 -0500
commit617da90c1dcf65428ddfb63fef897439950bc915 (patch)
tree03e71293fb57ce0b77a7867d104fcbaaedb76230
parent25823ac4c404dd293917b00ee3714f80128e6157 (diff)
parentdca0d1ee737918356a90f46bdc5505b107960031 (diff)
downloadu-boot-imx-617da90c1dcf65428ddfb63fef897439950bc915.zip
u-boot-imx-617da90c1dcf65428ddfb63fef897439950bc915.tar.gz
u-boot-imx-617da90c1dcf65428ddfb63fef897439950bc915.tar.bz2
Merge branch 't-next-marvell' into t-next-at91
-rw-r--r--cpu/arm926ejs/kirkwood/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpu/arm926ejs/kirkwood/cpu.c b/cpu/arm926ejs/kirkwood/cpu.c
index bab5faf..6fc3902 100644
--- a/cpu/arm926ejs/kirkwood/cpu.c
+++ b/cpu/arm926ejs/kirkwood/cpu.c
@@ -27,6 +27,7 @@
#include <asm/cache.h>
#include <u-boot/md5.h>
#include <asm/arch/kirkwood.h>
+#include <hush.h>
#define BUFLEN 16