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/serial.h | |
parent | 27130f133eda205b07d97b475a2ef96ec3f46b0f (diff) | |
parent | a87bc64cb4311323f592265541ced6ec9171d4d6 (diff) | |
download | u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.zip u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.gz u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'include/serial.h')
-rw-r--r-- | include/serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/serial.h b/include/serial.h index fc38469..15ab73c 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; |