projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
cpu
/
mips
/
asc_serial.c
diff --git
a/cpu/mips/asc_serial.c
b/cpu/mips/asc_serial.c
index 3498b61e8be024b89ed55ed32b8dd1d4604dce29..be686c2ae8ddbb5e0fc0594f0998cf3b19289da1 100644
(file)
--- 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 */