diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /common/cmd_bedbug.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
	drivers/usb/usb_ohci.c
Diffstat (limited to 'common/cmd_bedbug.c')
| -rw-r--r-- | common/cmd_bedbug.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c index 94f7e0847..3e597f982 100644 --- a/common/cmd_bedbug.c +++ b/common/cmd_bedbug.c @@ -218,7 +218,7 @@ void bedbug_main_loop (unsigned long addr, struct pt_regs *regs)  	int flag;		/* Command flags          */  	int rc = 0;		/* Result from run_command */  	char prompt_str[20];	/* Prompt string          */ -	static char lastcommand[CFG_CBSIZE] = { 0 };	/* previous command */ +	static char lastcommand[CONFIG_SYS_CBSIZE] = { 0 };	/* previous command */  	/* -------------------------------------------------- */  	if (bug_ctx.clear) |