diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
| commit | 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (patch) | |
| tree | 9e796e38d4edeabec4d091ed89d6fe179e84956c /arch/arm/cpu/arm1176/cpu.c | |
| parent | 86caca1cd97ba71b7a7c82f2b0163682df35ce5d (diff) | |
| parent | 1f241263e088a71b8f33f87b03a37c5418d41e2e (diff) | |
Merge branch 'master' into next
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm/cpu/arm1176/cpu.c')
| -rw-r--r-- | arch/arm/cpu/arm1176/cpu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm1176/cpu.c b/arch/arm/cpu/arm1176/cpu.c index befa0cdcc4..c0fd114e16 100644 --- a/arch/arm/cpu/arm1176/cpu.c +++ b/arch/arm/cpu/arm1176/cpu.c @@ -33,9 +33,6 @@ #include <common.h> #include <command.h> -#ifdef CONFIG_S3C64XX -#include <asm/arch/s3c6400.h> -#endif #include <asm/system.h> static void cache_flush (void); |