From: Remy Bohmer <linux@bohmer.net>
Date: Thu, 17 Jun 2010 19:17:08 +0000 (+0200)
Subject: Fix console_buffer size conflict error.
X-Git-Tag: v2010.09-rc1~108^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1f9d10f694f6f901a826a5b42fbfe914e2117971;p=oweals%2Fu-boot.git

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>
---

diff --git a/common/hush.c b/common/hush.c
index 06c5ff8df4..9eea90f428 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];