summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-30 01:04:48 +0200
committerWolfgang Denk <wd@denx.de>2010-06-30 01:04:48 +0200
commit55357b7846237d12aa5f07aec657c5dbfaf790ed (patch)
treed95879d513876d874e320b42c3dd32d6d3d02f35 /common
parente5ed138a23923ebe61843244748d98d3dbc04777 (diff)
parentbde3892edac99bf974e5b9809a112a6ce530be03 (diff)
downloadu-boot-imx-55357b7846237d12aa5f07aec657c5dbfaf790ed.zip
u-boot-imx-55357b7846237d12aa5f07aec657c5dbfaf790ed.tar.gz
u-boot-imx-55357b7846237d12aa5f07aec657c5dbfaf790ed.tar.bz2
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'common')
-rw-r--r--common/hush.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/hush.c b/common/hush.c
index 06c5ff8..9eea90f 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1018,7 +1018,7 @@ static void get_user_input(struct in_str *i)
fflush(stdout);
i->p = the_command;
#else
- extern char console_buffer[CONFIG_SYS_CBSIZE];
+ extern char console_buffer[];
int n;
static char the_command[CONFIG_SYS_CBSIZE];