From 05a95d98bd9aaf607f2c1c3aa61166079a5fff3c Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 19 Feb 2010 13:21:38 -0800
Subject: [PATCH] --- yaml --- r: 182586 b: refs/heads/master c:
 8e92dc767abb58357e696a48fc3d8ce615a9c01a h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/boot/video-vga.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e7928d7aa7e7..0a78b1865f42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb572a5c7951288e265b3e8f9a5d37b6abb2e996
+refs/heads/master: 8e92dc767abb58357e696a48fc3d8ce615a9c01a
diff --git a/trunk/arch/x86/boot/video-vga.c b/trunk/arch/x86/boot/video-vga.c
index 819caa1f2008..ed7aeff786b2 100644
--- a/trunk/arch/x86/boot/video-vga.c
+++ b/trunk/arch/x86/boot/video-vga.c
@@ -42,22 +42,15 @@ static u8 vga_set_basic_mode(void)
 {
 	struct biosregs ireg, oreg;
 	u16 ax;
-	u8 rows;
 	u8 mode;
 
 	initregs(&ireg);
 
+	/* Query current mode */
 	ax = 0x0f00;
 	intcall(0x10, &ireg, &oreg);
 	mode = oreg.al;
 
-	set_fs(0);
-	rows = rdfs8(0x484);	/* rows minus one */
-
-	if ((oreg.ax == 0x5003 || oreg.ax == 0x5007) &&
-	    (rows == 0 || rows == 24))
-		return mode;
-
 	if (mode != 3 && mode != 7)
 		mode = 3;