Commit:     464bdd33e9baad9806c7adbd8dfc37081a55f27e
Parent:     66fd14120edea89d353fac0649e9ec0045ec958f
Author:     Antonino A. Daplas <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:37:29 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:26 2007 -0700

    fbdev: ignore VESA modes if framebuffer is disabled
    If the option vga=<VESA graphics mode> is added to the boot parameter, it 
    activate graphics mode, but without any framebuffer support, the user is 
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/i386/boot/video.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 8143c95..5e2280c 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
        orb     %ah, %ah
        jz      setmenu
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to