Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / board / gaisler / grsim_leon2 / grsim_leon2.c

diff --git a/board/gaisler/grsim_leon2/grsim_leon2.c b/board/gaisler/grsim_leon2/grsim_leon2.c
index 55dfe8286a59344a6cf72a1484321ecc3a59cdbb..61445fe254f8ac24bf75d1aa92f611c2a1de749e 100644 (file)
--- a/board/gaisler/grsim_leon2/grsim_leon2.c
+++ b/board/gaisler/grsim_leon2/grsim_leon2.c
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <asm/leon.h>
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        return 1;
 }