Skip to content

Commit 2f1e1d8

Browse files
nivedita76gregkh
authored andcommitted
arch/x86/setup: Drop dummy_con initialization
con_init in tty/vt.c will now set conswitchp to dummy_con if it's unset. Drop it from arch setup code. Signed-off-by: Arvind Sankar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5ef438c commit 2f1e1d8

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/x86/kernel/setup.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,8 +1295,6 @@ void __init setup_arch(char **cmdline_p)
12951295
#if defined(CONFIG_VGA_CONSOLE)
12961296
if (!efi_enabled(EFI_BOOT) || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))
12971297
conswitchp = &vga_con;
1298-
#elif defined(CONFIG_DUMMY_CONSOLE)
1299-
conswitchp = &dummy_con;
13001298
#endif
13011299
#endif
13021300
x86_init.oem.banner();

0 commit comments

Comments
 (0)