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

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

diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index 03728074863b19eed9b06add838ef688178a61dd..e6510c9559f9bd632b4a17937eb2b4a3963143c8 100644 (file)
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -38,7 +38,7 @@ int checkboard(void)
        return 0;
 };
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        volatile siu_t *siu = (siu_t *) (MMAP_SIU);
        volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM);