diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
| commit | b706d63559aeec352bc72dd86d7d5423c15f6a60 (patch) | |
| tree | fdeda4d61970fef239d9d66ecd851fa46cfe5ec0 /common/hush.c | |
| parent | c8603cfbd4573379a6076c9c208545ba2bbf019a (diff) | |
| parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
| download | olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.tar.xz olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.zip | |
Merge with git://www.denx.de/git/u-boot.git
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 feb5627ff..582635c04 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); |