Merge git://www.denx.de/git/u-boot

Conflicts:

	drivers/Makefile
This commit is contained in:
Nobuhiro Iwamatsu
2007-12-07 01:20:16 +09:00
295 changed files with 2827 additions and 1178 deletions

View File

@@ -68,8 +68,6 @@ DECLARE_GLOBAL_DATA_PTR;
# define SYNC /* nothing */
#endif
#if defined(CONFIG_CMD_IDE)
#ifdef CONFIG_IDE_8xx_DIRECT
/* Timings for IDE Interface
*
@@ -2081,5 +2079,3 @@ U_BOOT_CMD(
"diskboot- boot from IDE device\n",
"loadAddr dev:part\n"
);
#endif