From 931ada2476fa628e0541ec29e368769c15663d0b Mon Sep 17 00:00:00 2001
From: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
Date: Thu, 24 Jan 2008 19:52:44 +0300
Subject: [PATCH] --- yaml --- r: 78064 b: refs/heads/master c:
 a382963edc55815b9ec56259c87b1405083acadf h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../arch/mips/mips-boards/malta/malta_setup.c | 39 +++++++++++--------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index c527150ddbe1..cc864dc765b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3a4ce9587cd1e810f31c87ecb89033d5fd269ce
+refs/heads/master: a382963edc55815b9ec56259c87b1405083acadf
diff --git a/trunk/arch/mips/mips-boards/malta/malta_setup.c b/trunk/arch/mips/mips-boards/malta/malta_setup.c
index 79d74ea75bc4..8b391ee034af 100644
--- a/trunk/arch/mips/mips-boards/malta/malta_setup.c
+++ b/trunk/arch/mips/mips-boards/malta/malta_setup.c
@@ -132,6 +132,26 @@ static void __init pci_clock_check(void)
 }
 #endif
 
+#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
+static void __init screen_info_setup(void)
+{
+	screen_info = (struct screen_info) {
+		.orig_x = 0,
+		.orig_y = 25,
+		.ext_mem_k = 0,
+		.orig_video_page = 0,
+		.orig_video_mode = 0,
+		.orig_video_cols = 80,
+		.unused2 = 0,
+		.orig_video_ega_bx = 0,
+		.unused3 = 0,
+		.orig_video_lines = 25,
+		.orig_video_isVGA = VIDEO_TYPE_VGAC,
+		.orig_video_points = 16
+	};
+}
+#endif
+
 void __init plat_mem_setup(void)
 {
 	unsigned int i;
@@ -200,23 +220,8 @@ void __init plat_mem_setup(void)
 #ifdef CONFIG_BLK_DEV_FD
 	fd_activate();
 #endif
-#ifdef CONFIG_VT
-#if defined(CONFIG_VGA_CONSOLE)
-	screen_info = (struct screen_info) {
-		.orig_x = 0,
-		.orig_y = 25,
-		.ext_mem_k = 0,
-		.orig_video_page = 0,
-		.orig_video_mode = 0,
-		.orig_video_cols = 80,
-		.unused2 = 0,
-		.orig_video_ega_bx = 0,
-		.unused3 = 0,
-		.orig_video_lines = 25,
-		.orig_video_isVGA = VIDEO_TYPE_VGAC,
-		.orig_video_points = 16
-	};
-#endif
+#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
+	screen_info_setup();
 #endif
 	mips_reboot_setup();
 }