diff options
| author | Andy Fleming <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
| commit | 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch) | |
| tree | 4bc9e1362c3090bb6d2df71109228ca61b8d00ce /common/hush.c | |
| parent | 5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff) | |
| parent | 5dc210dec5bace98a50b6ba905347890091a9bb0 (diff) | |
| download | u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.zip u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.gz u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.bz2 | |
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 'common/hush.c')
| -rw-r--r-- | common/hush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/hush.c b/common/hush.c index feb5627..582635c 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1682,7 +1682,7 @@ static int run_pipe_real(struct pipe *pi) return -1; /* give up after bad command */ } else { int rcode; -#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) +#if defined(CONFIG_CMD_BOOTD) extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* avoid "bootd" recursion */ @@ -1694,7 +1694,7 @@ static int run_pipe_real(struct pipe *pi) else flag |= CMD_FLAG_BOOTD; } -#endif /* CFG_CMD_BOOTD */ +#endif /* found - check max args */ if ((child->argc - i) > cmdtp->maxargs) { printf ("Usage:\n%s\n", cmdtp->usage); |