Merge branch 'master' into next

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

diff --git a/board/trab/trab.c b/board/trab/trab.c
index ea782a9137e21d248290001be705e830a5d2a42a..71fd22c158ccfb51586998a5643f7267c05fb68a 100644 (file)
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <netdev.h>
 #include <malloc.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <command.h>
 
 DECLARE_GLOBAL_DATA_PTR;