summaryrefslogtreecommitdiff
path: root/common/hush.c
diff options
context:
space:
mode:
authorRemy Bohmer <linux@bohmer.net>2010-06-17 21:17:08 +0200
committerWolfgang Denk <wd@denx.de>2010-06-29 21:12:43 +0200
commit1f9d10f694f6f901a826a5b42fbfe914e2117971 (patch)
tree4c6dd79a025553303b2994ea506ec1a46893cdf7 /common/hush.c
parent75997dc54f4ddbc4e9ed5dcebbe79951aa7128d1 (diff)
downloadu-boot-imx-1f9d10f694f6f901a826a5b42fbfe914e2117971.zip
u-boot-imx-1f9d10f694f6f901a826a5b42fbfe914e2117971.tar.gz
u-boot-imx-1f9d10f694f6f901a826a5b42fbfe914e2117971.tar.bz2
Fix console_buffer size conflict error.
The console_buffer size is declared in common/main.c as -- char console_buffer[CONFIG_SYS_CBSIZE + 1]; so this extern definition is wrong. Signed-off-by: Remy Bohmer <linux@bohmer.net>
Diffstat (limited to 'common/hush.c')
-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];