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

2012-12-22 05:55:19 -07:00
parent ba6d4b64b3 96764df1b4
commit da77a0e593
163 changed files with 8453 additions and 1096 deletions
--- a/drivers/serial/s3c64xx.c
+++ b/drivers/serial/s3c64xx.c
@@ -22,7 +22,8 @@
 */

 #include <common.h>
-
+#include <linux/compiler.h>
+#include <serial.h>
 #include <asm/arch/s3c6400.h>

 DECLARE_GLOBAL_DATA_PTR;