From: "Antonino A. Daplas" If the option vga= 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 Signed-off-by: Andrew Morton --- arch/i386/boot/video.S | 4 +++- arch/x86_64/boot/video.S | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff -puN arch/i386/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled arch/i386/boot/video.S --- a/arch/i386/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled +++ a/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 diff -puN arch/x86_64/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled arch/x86_64/boot/video.S --- a/arch/x86_64/boot/video.S~fbdev-ignore-vesa-modes-if-framebuffer-is-disabled +++ a/arch/x86_64/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 _