Merge branch 'next' of ../next

[oweals/u-boot.git] / board / gaisler / gr_xc3s_1500 / gr_xc3s_1500.c

diff --git a/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c b/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c
index 1ee70248124928f6f196e366ea1946a7b5327bf4..fc8cf84f9927656e44127442ce552688a6abbcbe 100644 (file)
--- a/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c
+++ b/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <asm/leon.h>
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        return 1;
 }