diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
| commit | 57bf140ac66f95c9c36c494e4d027551b5477b01 (patch) | |
| tree | 78cc2602ee9dca3284e47f38d29380171fb53646 /cpu/arm920t/s3c24x0/speed.c | |
| parent | 34ddbd171ba154e9afd83f07a07ad8b57ac592e3 (diff) | |
| parent | 71636fa7c3de63de29c0f514d5c725eccb011657 (diff) | |
| download | talos-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/arm920t/s3c24x0/speed.c')
| -rw-r--r-- | cpu/arm920t/s3c24x0/speed.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cpu/arm920t/s3c24x0/speed.c b/cpu/arm920t/s3c24x0/speed.c index 136c7794a6..b13283a798 100644 --- a/cpu/arm920t/s3c24x0/speed.c +++ b/cpu/arm920t/s3c24x0/speed.c @@ -30,15 +30,10 @@ */ #include <common.h> -#if defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB) +#ifdef CONFIG_S3C24X0 #include <asm/io.h> - -#if defined(CONFIG_S3C2400) -#include <s3c2400.h> -#elif defined(CONFIG_S3C2410) -#include <s3c2410.h> -#endif +#include <asm/arch/s3c24x0_cpu.h> #define MPLL 0 #define UPLL 1 @@ -100,6 +95,4 @@ ulong get_UCLK(void) return get_PLLCLK(UPLL); } -#endif /* defined(CONFIG_S3C2400) || - defined (CONFIG_S3C2410) || - defined (CONFIG_TRAB) */ +#endif /* CONFIG_S3C24X0 */ |
