From 5cbfe29323fa684ba9bd309aef4df16475e2e838 Mon Sep 17 00:00:00 2001
From: qiaochong <qiaochong@loongson.cn>
Date: Mon, 9 Aug 2010 17:21:27 -0700
Subject: [PATCH] --- yaml --- r: 207357 b: refs/heads/master c:
 9e0ba741aabdf129d561e62d207c75146adef5e8 h: refs/heads/master i:   207355:
 753eb6dbe83e6793bad475f44e7dcf754743e50e v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/char/vt.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 731bbab27dee..46d07a5d4310 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02f0777a0d6560eb995aade34a1b82f95c0452da
+refs/heads/master: 9e0ba741aabdf129d561e62d207c75146adef5e8
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
index cff1d4bce21d..44f03ddd8871 100644
--- a/trunk/drivers/char/vt.c
+++ b/trunk/drivers/char/vt.c
@@ -837,9 +837,10 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
 				unsigned int cols, unsigned int lines)
 {
 	unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;
+	unsigned long end;
 	unsigned int old_cols, old_rows, old_row_size, old_screen_size;
 	unsigned int new_cols, new_rows, new_row_size, new_screen_size;
-	unsigned int end, user;
+	unsigned int user;
 	unsigned short *newscreen;
 
 	WARN_CONSOLE_UNLOCKED();