summaryrefslogtreecommitdiffstats
path: root/cpu/arm1176/cpu.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-04-08 00:06:31 +0200
committerWolfgang Denk <wd@denx.de>2010-04-08 00:06:31 +0200
commit6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5 (patch)
treedf5b6d67be790d75e60f8fcd97360fc1f179ab0d /cpu/arm1176/cpu.c
parentd8bc0a2889700ba063598de6d4e7d135360b537e (diff)
parentb5045cdda556c73e2697cd1d3ea6563315cbf490 (diff)
downloadblackbird-obmc-uboot-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.tar.gz
blackbird-obmc-uboot-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'cpu/arm1176/cpu.c')
-rw-r--r--cpu/arm1176/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c
index 2c0014f2bd..befa0cdcc4 100644
--- a/cpu/arm1176/cpu.c
+++ b/cpu/arm1176/cpu.c
@@ -33,7 +33,9 @@
#include <common.h>
#include <command.h>
+#ifdef CONFIG_S3C64XX
#include <asm/arch/s3c6400.h>
+#endif
#include <asm/system.h>
static void cache_flush (void);
OpenPOWER on IntegriCloud