diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
| commit | 521dcd30b9cc5b72cd27ae04104f19369251aa20 (patch) | |
| tree | bc33710a3ae6f97f0dcae8f02fd6f3c91322d96d /common/cmd_ide.c | |
| parent | 260eea5676ca46903a335686cc020b29c4ca46fe (diff) | |
| parent | 8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (diff) | |
| download | olio-uboot-2014.01-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.xz olio-uboot-2014.01-521dcd30b9cc5b72cd27ae04104f19369251aa20.zip | |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
Diffstat (limited to 'common/cmd_ide.c')
| -rw-r--r-- | common/cmd_ide.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 2e45b7044..c38be4f1a 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -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 |