mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge git://www.denx.de/git/u-boot
Conflicts: drivers/Makefile
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user