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 /drivers/serial/serial_s3c24x0.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 'drivers/serial/serial_s3c24x0.c')
-rw-r--r-- | drivers/serial/serial_s3c24x0.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c index c2c72e456f..5dd4dd8160 100644 --- a/drivers/serial/serial_s3c24x0.c +++ b/drivers/serial/serial_s3c24x0.c @@ -19,11 +19,7 @@ */ #include <common.h> -#if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB) -#include <s3c2400.h> -#elif defined(CONFIG_S3C2410) -#include <s3c2410.h> -#endif +#include <asm/arch/s3c24x0_cpu.h> DECLARE_GLOBAL_DATA_PTR; |