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 <[email protected]>
Cc: Antonino A. Daplas <[email protected]>,
Cc: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

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