diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 10:06:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:09:05 +0100 |
| commit | 0c79358b874af31430cf8d26540ae7b8713505f6 (patch) | |
| tree | 82f5c96e8968fb93f08db1daa0ca6b8f98b9fdc7 /arch/m68k/kernel/setup.c | |
| parent | [PATCH] m68k: cast in strnlen switched to unsigned long (diff) | |
| download | linux-0c79358b874af31430cf8d26540ae7b8713505f6.tar.xz linux-0c79358b874af31430cf8d26540ae7b8713505f6.zip | |
[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.c | 4 |
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) } } +#ifdef CONFIG_DUMMY_CONSOLE + conswitchp = &dummy_con; +#endif + switch (m68k_machtype) { #ifdef CONFIG_AMIGA case MACH_AMIGA: |