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

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

diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index e8f621ba3f3afa6d34a0f6e200e6d0c46f31221b..c9ed341bbd1c875788bbd0b4172344db4e7eeeb9 100644 (file)
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -49,7 +49,7 @@ int checkboard (void) {
 };
 
 
-long int initdram (int board_type) {
+phys_size_t initdram (int board_type) {
        unsigned long   junk = 0xa5a59696;
 
        /*