Merge branch 'master' into next

[u-boot] / board / trab / rs485.c

diff --git a/board/trab/rs485.c b/board/trab/rs485.c
index 7d5c0a2c9ccb85c8fc43234dee8704b32ca1dbf4..ad0c13665e41073c0a3f0a088e2304157b0f79fd 100644 (file)
--- a/board/trab/rs485.c
+++ b/board/trab/rs485.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include "rs485.h"
 
 static void rs485_setbrg (void);