summaryrefslogtreecommitdiff
path: root/arch/m68k/q40/config.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 12:06:35 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 20:09:05 +0300
commit0c79358b874af31430cf8d26540ae7b8713505f6 (patch)
tree82f5c96e8968fb93f08db1daa0ca6b8f98b9fdc7 /arch/m68k/q40/config.c
parent35efbcabdc217f2b3a73bf3b895559e8f269e258 (diff)
downloadlinux-0c79358b874af31430cf8d26540ae7b8713505f6.tar.xz
[PATCH] m68k: Moved initialisation of conswitchp from subarches to global arch setup
Signed-off-by: Kars de Jong <jongk@linux-m68k.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/q40/config.c')
-rw-r--r--arch/m68k/q40/config.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 02b626bae4ae..67e88a4efac0 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -194,9 +194,6 @@ void __init config_q40(void)
mach_heartbeat = q40_heartbeat;
#endif
mach_halt = q40_halt;
-#ifdef CONFIG_DUMMY_CONSOLE
- conswitchp = &dummy_con;
-#endif
/* disable a few things that SMSQ might have left enabled */
q40_disable_irqs();