aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/m68k/kernel/setup_mm.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-04-01 12:26:12 +0200
committerJiri Kosina <jkosina@suse.cz>2020-04-01 12:26:12 +0200
commitc9f289701540baeef9ac7c9977d67a7259f404db (patch)
treeac3c29d41da02ac735c9a12da78905842fbccd2f /arch/m68k/kernel/setup_mm.c
parentMerge branch 'for-5.6/upstream-fixes' into for-linus (diff)
parentHID: appleir: Use devm_kzalloc() instead of kzalloc() (diff)
downloadwireguard-linux-c9f289701540baeef9ac7c9977d67a7259f404db.tar.xz
wireguard-linux-c9f289701540baeef9ac7c9977d67a7259f404db.zip
Merge branch 'for-5.7/appleir' into for-linus
- small code cleanups in hid-appleir from Lucas Tanure
Diffstat (limited to 'arch/m68k/kernel/setup_mm.c')
-rw-r--r--arch/m68k/kernel/setup_mm.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 528484feff80..ab8aa7be260f 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -274,10 +274,6 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
-#ifdef CONFIG_DUMMY_CONSOLE
- conswitchp = &dummy_con;
-#endif
-
switch (m68k_machtype) {
#ifdef CONFIG_AMIGA
case MACH_AMIGA: