Merge branch 'master' of git://www.denx.de/git/u-boot-avr32

[u-boot] / board / esd / hh405 / hh405.c

diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c
index 67b5d5406dd84a0b047d1289b6fdb1141bc5ec72..802491a313a1afad43d20fe274b1d8d3c6f75ae4 100644 (file)
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -471,7 +471,7 @@ int misc_init_r (void)
         */
        *fpga_ctrl |= gd->board_type & 0x0003;
 
-       /*
+       /*
         * Setup and enable EEPROM write protection
         */
        out32(GPIO0_OR, in32(GPIO0_OR) | CFG_EEPROM_WP);
@@ -644,7 +644,7 @@ int checkboard (void)
 }
 
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        unsigned long val;