fbdev: ignore VESA modes if framebuffer is disabled

[powerpc.git] / arch / i386 / boot / video.S

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 8143c95..5e2280c 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