projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
[platform/kernel/u-boot.git]
/
cpu
/
arm1176
/
cpu.c
diff --git
a/cpu/arm1176/cpu.c
b/cpu/arm1176/cpu.c
index
d1a3327
..
befa0cd
100644
(file)
--- a/
cpu/arm1176/cpu.c
+++ b/
cpu/arm1176/cpu.c
@@
-33,7
+33,9
@@
#include <common.h>
#include <command.h>
-#include <s3c6400.h>
+#ifdef CONFIG_S3C64XX
+#include <asm/arch/s3c6400.h>
+#endif
#include <asm/system.h>
static void cache_flush (void);