Merge branch 'master' of git://git.denx.de/u-boot-samsung

This commit is contained in:
Wolfgang Denk
2010-09-08 00:03:22 +02:00
27 changed files with 274 additions and 195 deletions

View File

@ -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;