commit | f2302d4430e7f3f48308d6a585320fe96af8afbd | [log] [tgz] |
---|---|---|
author | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
committer | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 | |
parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd [diff] |
Fix merge problems Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile index 0667fc1..cedc8e0 100644 --- a/nand_spl/board/amcc/kilauea/Makefile +++ b/nand_spl/board/amcc/kilauea/Makefile
@@ -57,7 +57,7 @@ # create symbolic links for common files # from cpu directory -$(obj)44x_spd_ddr2.c: ecc.h +$(obj)44x_spd_ddr2.c: $(obj)ecc.h @rm -f $(obj)44x_spd_ddr2.c ln -s $(SRCTREE)/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c