summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArvind Sankar <nivedita@alum.mit.edu>2019-12-18 22:45:06 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-14 15:29:19 +0100
commitfec6388946ee05508543f0e3e5d34f436384548f (patch)
tree4f1fc2695b4b88763451eb6223774b44da47b4ea
parentarch/x86/setup: Drop dummy_con initialization (diff)
downloadlinux-fec6388946ee05508543f0e3e5d34f436384548f.tar.xz
linux-fec6388946ee05508543f0e3e5d34f436384548f.zip
arch/xtensa/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-25-nivedita@alum.mit.edu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/xtensa/kernel/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 0f93b67c7a5a..adead45debe8 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -405,8 +405,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
}