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>

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 8143c9516cb429ebdacf3e2fa3f2c7b10bec963e..5e2280cf4456296feffb3a815dc937deccf59cfc 100644 (file)
--- 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