Fix merge problems

[karo-tx-uboot.git] / board / atmel / atstk1000 / atstk1000.c

diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c
index 6371e2d4e3acb1f13ecb481d1d88d5eb1bba0bcf..d284fc1438adb9531d1c28222252ef905176d30d 100644 (file)
--- a/board/atmel/atstk1000/atstk1000.c
+++ b/board/atmel/atstk1000/atstk1000.c
@@ -104,7 +104,7 @@ phys_size_t initdram(int board_type)
        unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
 
        if (expected_size != actual_size)
-               printf("Warning: Only %u of %u MiB SDRAM is working\n",
+               printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
                                actual_size >> 20, expected_size >> 20);
 
        return actual_size;