projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPI: mxc_spi: fix swapping bug and add missing swapping in unaligned rx case
[oweals/u-boot.git]
/
drivers
/
serial
/
serial.c
diff --git
a/drivers/serial/serial.c
b/drivers/serial/serial.c
index 1073ac0ae9c4b54cf02075e4184ed6bc85695cc5..cd3439ee6a23d9b54089396d244e070dbf795ee6 100644
(file)
--- a/
drivers/serial/serial.c
+++ b/
drivers/serial/serial.c
@@
-29,9
+29,10
@@
#endif
#ifdef CONFIG_KIRKWOOD
#include <asm/arch/kirkwood.h>
#endif
#ifdef CONFIG_KIRKWOOD
#include <asm/arch/kirkwood.h>
-#endif
-#ifdef CONFIG_ORION5X
+#elif defined(CONFIG_ORION5X)
#include <asm/arch/orion5x.h>
#include <asm/arch/orion5x.h>
+#elif defined(CONFIG_ARMADA100)
+#include <asm/arch/armada100.h>
#endif
#if defined (CONFIG_SERIAL_MULTI)
#endif
#if defined (CONFIG_SERIAL_MULTI)