diff options
author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
commit | 1a5017601f6d17caedaa2bf069485d3e4155f1c0 (patch) | |
tree | 342b39d2a55eb4ebaf8b772bc8b74db4318d5eb7 /cpu/mips/asc_serial.c | |
parent | cdeb62e20d94005f2e80604fda03b498c3a6f704 (diff) | |
parent | 79b51ff8205f0354d5300570614c1d2db499679c (diff) | |
download | u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.zip u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.gz u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
Diffstat (limited to 'cpu/mips/asc_serial.c')
-rw-r--r-- | cpu/mips/asc_serial.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cpu/mips/asc_serial.c b/cpu/mips/asc_serial.c index 3498b61..be686c2 100644 --- a/cpu/mips/asc_serial.c +++ b/cpu/mips/asc_serial.c @@ -4,8 +4,6 @@ #include <config.h> -#if defined(CONFIG_PURPLE) || defined(CONFIG_INCA_IP) - #ifdef CONFIG_PURPLE #define serial_init asc_serial_init #define serial_putc asc_serial_putc @@ -368,4 +366,3 @@ int serial_tstc (void) return res; } -#endif /* CONFIG_PURPLE || CONFIG_INCA_IP */ |