aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/setup.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:06:35 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:09:05 -0500
commit0c79358b874af31430cf8d26540ae7b8713505f6 (patch)
tree82f5c96e8968fb93f08db1daa0ca6b8f98b9fdc7 /arch/m68k/kernel/setup.c
parent35efbcabdc217f2b3a73bf3b895559e8f269e258 (diff)
[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/kernel/setup.c')
-rw-r--r--arch/m68k/kernel/setup.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index c4d4d0523932..583526fa59c7 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -282,6 +282,10 @@ void __init setup_arch(char **cmdline_p)
282 } 282 }
283 } 283 }
284 284
285#ifdef CONFIG_DUMMY_CONSOLE
286 conswitchp = &dummy_con;
287#endif
288
285 switch (m68k_machtype) { 289 switch (m68k_machtype) {
286#ifdef CONFIG_AMIGA 290#ifdef CONFIG_AMIGA
287 case MACH_AMIGA: 291 case MACH_AMIGA: