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/mac | |
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/mac')
-rw-r--r-- | arch/m68k/mac/config.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index cd19cbb213e8..14f8d3f4e195 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -212,9 +212,6 @@ void __init config_mac(void) | |||
212 | mach_reset = mac_reset; | 212 | mach_reset = mac_reset; |
213 | mach_halt = mac_poweroff; | 213 | mach_halt = mac_poweroff; |
214 | mach_power_off = mac_poweroff; | 214 | mach_power_off = mac_poweroff; |
215 | #ifdef CONFIG_DUMMY_CONSOLE | ||
216 | conswitchp = &dummy_con; | ||
217 | #endif | ||
218 | mach_max_dma_address = 0xffffffff; | 215 | mach_max_dma_address = 0xffffffff; |
219 | #if 0 | 216 | #if 0 |
220 | mach_debug_init = mac_debug_init; | 217 | mach_debug_init = mac_debug_init; |