From: Andrew Morton <akpm@osdl.org>

Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/tty_io.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/char/tty_io.c~add-receive_room-flow-control-to-flush_to_ldisc-tidy drivers/char/tty_io.c
--- a/drivers/char/tty_io.c~add-receive_room-flow-control-to-flush_to_ldisc-tidy
+++ a/drivers/char/tty_io.c
@@ -2773,7 +2773,6 @@ static void flush_to_ldisc(void *private
 	unsigned long 	flags;
 	struct tty_ldisc *disc;
 	struct tty_buffer *tbuf, *head;
-	int count;
 	char *char_buf;
 	unsigned char *flag_buf;
 
@@ -2786,7 +2785,7 @@ static void flush_to_ldisc(void *private
 	if (head != NULL) {
 		tty->buf.head = NULL;
 		for (;;) {
-			count = head->commit - head->read;
+			int count = head->commit - head->read;
 			if (!count) {
 				if (head->next == NULL)
 					break;
_