diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:03:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:03:22 +0200 |
| commit | 09b4a9cf4003599f2cd609587dfa5f0b754640ed (patch) | |
| tree | 768c7e70dc393814643ed7b7290ea8e33fa95ba3 /include | |
| parent | 27130f133eda205b07d97b475a2ef96ec3f46b0f (diff) | |
| parent | a87bc64cb4311323f592265541ced6ec9171d4d6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/s5p_goni.h | 2 | ||||
| -rw-r--r-- | include/configs/smdkc100.h | 2 | ||||
| -rw-r--r-- | include/serial.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index c8ea8fda82b..dc01ceb7b26 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -30,7 +30,7 @@ /* High Level Configuration Options */ #define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */ -#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */ +#define CONFIG_S5P 1 /* which is in a S5P Family */ #define CONFIG_S5PC110 1 /* which is in a S5PC110 */ #define CONFIG_MACH_GONI 1 /* working with Goni */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 76a47c4456f..595d1740013 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -34,7 +34,7 @@ */ #define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */ -#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */ +#define CONFIG_S5P 1 /* which is in a S5P Family */ #define CONFIG_S5PC100 1 /* which is in a S5PC100 */ #define CONFIG_SMDKC100 1 /* working with SMDKC100 */ diff --git a/include/serial.h b/include/serial.h index fc384698196..15ab73c13d9 100644 --- a/include/serial.h +++ b/include/serial.h @@ -52,7 +52,7 @@ extern struct serial_device s3c24xx_serial1_device; extern struct serial_device s3c24xx_serial2_device; #endif -#if defined(CONFIG_S5PC1XX) +#if defined(CONFIG_S5P) extern struct serial_device s5p_serial0_device; extern struct serial_device s5p_serial1_device; extern struct serial_device s5p_serial2_device; |