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

2008-03-02 21:30:18 +01:00
parent 2f6e76d23c 64cd594e62
commit 24ae0d1728
1 changed files with 2 additions and 0 deletions
--- 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