diff options
author | Andy Fleming <afleming@freescale.com> | 2007-08-03 07:23:23 (GMT) |
---|---|---|
committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-08-03 07:23:23 (GMT) |
commit | 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch) | |
tree | 4bc9e1362c3090bb6d2df71109228ca61b8d00ce /tools | |
parent | 5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff) | |
parent | 5dc210dec5bace98a50b6ba905347890091a9bb0 (diff) | |
download | u-boot-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.xz |
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
Diffstat (limited to 'tools')
-rw-r--r-- | tools/updater/cmd_flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/updater/cmd_flash.c b/tools/updater/cmd_flash.c index c0e5772..a976e0d 100644 --- a/tools/updater/cmd_flash.c +++ b/tools/updater/cmd_flash.c @@ -28,7 +28,7 @@ #include <command.h> #include <flash.h> -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) +#if defined(CONFIG_CMD_FLASH) extern flash_info_t flash_info[]; /* info for FLASH chips */ @@ -427,4 +427,4 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last) return rcode; } -#endif /* CFG_CMD_FLASH */ +#endif |