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

diff --git a/board/amcc/acadia/memory.c b/board/amcc/acadia/memory.c
index 9346d2c52fb969590a7c1fbedb580081cf5d5dff..709d41e41aa456eaf7d60f4ea05296b66453b604 100644 (file)
--- a/board/amcc/acadia/memory.c
+++ b/board/amcc/acadia/memory.c
@@ -117,7 +117,9 @@ long int initdram(int board_type)
        return (CFG_MBYTES_RAM << 20);
 }
 
+#ifndef CONFIG_NAND_SPL
 int testdram(void)
 {
        return (0);
 }
+#endif