From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 9 May 2007 03:12:30 +0000 (-0700)
Subject: Revert "fbdev: ignore VESA modes if framebuffer is disabled"
X-Git-Tag: v2.6.22-rc1~346
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e73be3c8f254ef19d787f9b6757468175267eb;p=linux-2.6

Revert "fbdev: ignore VESA modes if framebuffer is disabled"

This reverts commit 464bdd33e9baad9806c7adbd8dfc37081a55f27e.

Peter Anvin correctly points out that VESA modes have nothing to do with
frame buffers per se - they are often just regular extended text modes.
Disabling them just because we don't have frame buffer support is very
wrong.

Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Antonino A. Daplas <adaplas@gmail.com>,
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 5e2280cf44..8143c9516c 100644
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -496,11 +496,9 @@ mode_set:
 	cmpb	$VIDEO_FIRST_V7>>8, %ah
 	jz	setv7
 	
-#ifdef CONFIG_FB
 	cmpb	$VIDEO_FIRST_VESA>>8, %ah
 	jnc	check_vesa
-#endif
-
+	
 	orb	%ah, %ah
 	jz	setmenu