diff -urNp linux-1020/arch/i386/boot/video.S linux-1030/arch/i386/boot/video.S --- linux-1020/arch/i386/boot/video.S 2001-07-05 20:28:16.000000000 +0200 +++ linux-1030/arch/i386/boot/video.S @@ -126,8 +126,12 @@ video: pushw %ds # We use different seg call mode_set # Set the mode jc vid1 +#ifndef CONFIG_VIDEO_IGNORE_BAD_MODE leaw badmdt, %si # Invalid mode ID call prtstr +#else + jmp vid1 +#endif /* CONFIG_VIDEO_IGNORE_BAD_MODE */ vid2: call mode_menu vid1: #ifdef CONFIG_VIDEO_RETAIN diff -urNp linux-1020/arch/i386/config.in linux-1030/arch/i386/config.in --- linux-1020/arch/i386/config.in +++ linux-1030/arch/i386/config.in @@ -438,6 +438,9 @@ if [ "$CONFIG_VT" = "y" ]; then comment 'Console drivers' bool 'VGA text console' CONFIG_VGA_CONSOLE bool 'Video mode selection support' CONFIG_VIDEO_SELECT + if [ "$CONFIG_VIDEO_SELECT" = "y" ]; then + bool 'Ignore bad video mode selections' CONFIG_VIDEO_IGNORE_BAD_MODE + fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'MDA text console (dual-headed) (EXPERIMENTAL)' CONFIG_MDA_CONSOLE source drivers/video/Config.in