Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'testing' into working

Browse source 
Conflicts:

	CHANGELOG
	fs/fat/fat.c
	include/configs/MPC8560ADS.h
	include/configs/pcs440ep.h
	net/eth.c
This commit is contained in:
Andy Fleming 2007-08-03 02:23:23 -05:00 • committed by Andrew Fleming-AFLEMING
commit 6bf6f114dc
790 changed files with 11070 additions and 15256 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/cmd_doc.c
View file

@ -19,7 +19,7 @@
# define SHOW_BOOT_PROGRESS(arg)
#endif
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if defined(CONFIG_CMD_DOC)
#include <linux/mtd/nftl.h>
#include <linux/mtd/doc2000.h>
@ -1615,4 +1615,4 @@ void doc_probe(unsigned long physadr)
}
}
#endif /* (CONFIG_COMMANDS & CFG_CMD_DOC) */
#endif