Merge commit 'wd/master'

[oweals/u-boot.git] / board / pm520 / pm520.c

diff --git a/board/pm520/pm520.c b/board/pm520/pm520.c
index 14c3f1d442f0c1d0e06df7ae08053d84dc4016bb..83d9bcd025f35f183eb45fdab32f6356fa4c2dff 100644 (file)
--- a/board/pm520/pm520.c
+++ b/board/pm520/pm520.c
@@ -84,7 +84,7 @@ static void sdram_start (int hi_addr)
  */
 
 #if defined(CONFIG_MPC5200)
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        ulong dramsize = 0;
        ulong dramsize2 = 0;
@@ -187,7 +187,7 @@ long int initdram (int board_type)
 
 #elif defined(CONFIG_MGT5100)
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        ulong dramsize = 0;
 #ifndef CFG_RAMBOOT