Merge branch 'master' into next

[u-boot] / board / samsung / smdk2400 / smdk2400.c

diff --git a/board/samsung/smdk2400/smdk2400.c b/board/samsung/smdk2400/smdk2400.c
index 42bf00868dae9f14ec260786a2d7293faf118c4a..1294d3f1b1c664d2c2cac1866367ce9db598b0b0 100644 (file)
--- a/board/samsung/smdk2400/smdk2400.c
+++ b/board/samsung/smdk2400/smdk2400.c
@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;