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

2010-06-17 22:22:06 +02:00
parent 530135dcac ce9c227cc7
commit cecda170e7
16 changed files with 1530 additions and 0 deletions
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -30,6 +30,9 @@
 #ifdef CONFIG_KIRKWOOD
 #include <asm/arch/kirkwood.h>
 #endif
+#ifdef CONFIG_ORION5X
+#include <asm/arch/orion5x.h>
+#endif

 #if defined (CONFIG_SERIAL_MULTI)
 #include <serial.h>