summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2007-05-08 00:37:29 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 11:15:26 -0700
commit464bdd33e9baad9806c7adbd8dfc37081a55f27e (patch)
tree5701a386150123e50959b009fe59904f6e10f7a6
parent66fd14120edea89d353fac0649e9ec0045ec958f (diff)
fbdev: ignore VESA modes if framebuffer is disabled
If the option vga=<VESA graphics mode> is added to the boot parameter, it will activate graphics mode, but without any framebuffer support, the user is left with an unusable display. Change the behavior such that the user is instead prompted for another mode (ala vga=ask). NOTE: People can always use vbetool to set a graphics mode if this is really desired, but the number of people doing this approaches zero. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/i386/boot/video.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 8143c9516cb4..5e2280cf4456 100644
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -496,9 +496,11 @@ 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