aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 20:12:30 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 20:12:30 -0700
commit01e73be3c8f254ef19d787f9b6757468175267eb (patch)
treeba389f13ae71fc467be54be1e7f192739ba82288 /arch
parent7b82dc0e64e93f430182f36b46b79fcee87d3532 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/boot/video.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 5e2280cf445..8143c9516cb 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