summaryrefslogtreecommitdiffstats
path: root/cpu/arm1176/cpu.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-01 12:10:51 +0100
committerWolfgang Denk <wd@denx.de>2009-12-01 12:10:51 +0100
commit57bf140ac66f95c9c36c494e4d027551b5477b01 (patch)
tree78cc2602ee9dca3284e47f38d29380171fb53646 /cpu/arm1176/cpu.c
parent34ddbd171ba154e9afd83f07a07ad8b57ac592e3 (diff)
parent71636fa7c3de63de29c0f514d5c725eccb011657 (diff)
downloadtalos-obmc-uboot-57bf140ac66f95c9c36c494e4d027551b5477b01.tar.gz
talos-obmc-uboot-57bf140ac66f95c9c36c494e4d027551b5477b01.zip
Merge branch 'next-sync' of git://git.denx.de/u-boot-arm into next
Diffstat (limited to 'cpu/arm1176/cpu.c')
-rw-r--r--cpu/arm1176/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c
index d1a3327483..2c0014f2bd 100644
--- a/cpu/arm1176/cpu.c
+++ b/cpu/arm1176/cpu.c
@@ -33,7 +33,7 @@
#include <common.h>
#include <command.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
#include <asm/system.h>
static void cache_flush (void);
OpenPOWER on IntegriCloud