Merge branch 'master' into next

[u-boot] / drivers / serial / s3c64xx.c

diff --git a/drivers/serial/s3c64xx.c b/drivers/serial/s3c64xx.c
index 9d8fcb9b4983b92bfe93e7743f33865185f9698e..6d22df7cf4ee7bdad47093e36ee227094dd68d28 100644 (file)
--- a/drivers/serial/s3c64xx.c
+++ b/drivers/serial/s3c64xx.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * (C) Copyright 2008
  * Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 
 #ifdef CONFIG_SERIAL1
 #define UART_NR        S3C64XX_UART0