Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[u-boot] / board / freescale / m5329evb / m5329evb.c

diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index 242eb1a18825602baddab18fc2182909afb5e42a..f9fa9fb9cf2b2d6de83ab143ca7f764a1eb3446d 100644 (file)
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -37,7 +37,7 @@ int checkboard(void)
        return 0;
 };
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM);
        u32 dramsize, i;