diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:09:05 -0500 |
commit | 0c79358b874af31430cf8d26540ae7b8713505f6 (patch) | |
tree | 82f5c96e8968fb93f08db1daa0ca6b8f98b9fdc7 /arch/m68k/apollo | |
parent | 35efbcabdc217f2b3a73bf3b895559e8f269e258 (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/apollo')
-rw-r--r-- | arch/m68k/apollo/config.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 264929471253..d401962d9b25 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c | |||
@@ -176,9 +176,6 @@ void config_apollo(void) { | |||
176 | mach_set_clock_mmss = dn_dummy_set_clock_mmss; /* */ | 176 | mach_set_clock_mmss = dn_dummy_set_clock_mmss; /* */ |
177 | mach_process_int = dn_process_int; | 177 | mach_process_int = dn_process_int; |
178 | mach_reset = dn_dummy_reset; /* */ | 178 | mach_reset = dn_dummy_reset; /* */ |
179 | #ifdef CONFIG_DUMMY_CONSOLE | ||
180 | conswitchp = &dummy_con; | ||
181 | #endif | ||
182 | #ifdef CONFIG_HEARTBEAT | 179 | #ifdef CONFIG_HEARTBEAT |
183 | mach_heartbeat = dn_heartbeat; | 180 | mach_heartbeat = dn_heartbeat; |
184 | #endif | 181 | #endif |