From: Arvind Sankar <nivedita@alum.mit.edu>
Date: Wed, 18 Dec 2019 21:45:04 +0000 (-0500)
Subject: arch/unicore32/setup: Drop dummy_con initialization
X-Git-Tag: v5.6-rc1~139^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ef438c854d326b662b79d8f84f1beb977529c38;p=tomoyo%2Ftomoyo-test1.git

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>
---

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();