summaryrefslogtreecommitdiff
path: root/arch/unicore32
diff options
context:
space:
mode:
authorArvind Sankar <nivedita@alum.mit.edu>2019-12-18 16:45:04 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-14 15:29:18 +0100
commit5ef438c854d326b662b79d8f84f1beb977529c38 (patch)
tree338b55ec56b1b40320c4a7db371e95b84c06612c /arch/unicore32
parent2f01bfc1ecfba5381e788d59df10f05c542b494e (diff)
arch/unicore32/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 <nivedita@alum.mit.edu> Link: https://lore.kernel.org/r/20191218214506.49252-23-nivedita@alum.mit.edu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/unicore32')
-rw-r--r--arch/unicore32/kernel/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c
index 95ae3b54df68..0c4242a5ee1d 100644
--- a/arch/unicore32/kernel/setup.c
+++ b/arch/unicore32/kernel/setup.c
@@ -270,8 +270,6 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_VT
#if defined(CONFIG_VGA_CONSOLE)
conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
- conswitchp = &dummy_con;
#endif
#endif
early_trap_init();