diff options
author | Arvind Sankar <nivedita@alum.mit.edu> | 2019-12-18 16:44:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-14 15:29:16 +0100 |
commit | 143c2ce261250adf86a3c1f4f5acaf5ba35ea07d (patch) | |
tree | a1f6d921ed6603af541e423c647f6dd23ad56480 /arch/m68k/kernel/setup_no.c | |
parent | 6b448f12a221d172dbe0a4793f8bed302079c874 (diff) | |
download | linux-stable-143c2ce261250adf86a3c1f4f5acaf5ba35ea07d.tar.gz linux-stable-143c2ce261250adf86a3c1f4f5acaf5ba35ea07d.tar.bz2 linux-stable-143c2ce261250adf86a3c1f4f5acaf5ba35ea07d.zip |
arch/m68k/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-11-nivedita@alum.mit.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/kernel/setup_no.c')
-rw-r--r-- | arch/m68k/kernel/setup_no.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 3c5def10d486..a63483de7a42 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -146,10 +146,6 @@ void __init setup_arch(char **cmdline_p) memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); boot_command_line[COMMAND_LINE_SIZE-1] = 0; -#if defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_DUMMY_CONSOLE) - conswitchp = &dummy_con; -#endif - /* * Give all the memory to the bootmap allocator, tell it to put the * boot mem_map at the start of memory. |