diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
| commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/serial.h | |
| parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.gz u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/serial.h')
| -rw-r--r-- | include/serial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/serial.h b/include/serial.h index 2b99e53..e3d8b36 100644 --- a/include/serial.h +++ b/include/serial.h @@ -27,12 +27,12 @@ extern struct serial_device * default_serial_console (void); defined(CONFIG_MPC5xxx) extern struct serial_device serial0_device; extern struct serial_device serial1_device; -#if defined(CFG_NS16550_SERIAL) +#if defined(CONFIG_SYS_NS16550_SERIAL) extern struct serial_device eserial1_device; extern struct serial_device eserial2_device; extern struct serial_device eserial3_device; extern struct serial_device eserial4_device; -#endif /* CFG_NS16550_SERIAL */ +#endif /* CONFIG_SYS_NS16550_SERIAL */ #endif |