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/hp300 | |
| 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/hp300')
| -rw-r--r-- | arch/m68k/hp300/config.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index a0b854f3f94a..6d129eef370f 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c | |||
| @@ -261,9 +261,6 @@ void __init config_hp300(void) | |||
| 261 | #ifdef CONFIG_HEARTBEAT | 261 | #ifdef CONFIG_HEARTBEAT |
| 262 | mach_heartbeat = hp300_pulse; | 262 | mach_heartbeat = hp300_pulse; |
| 263 | #endif | 263 | #endif |
| 264 | #ifdef CONFIG_DUMMY_CONSOLE | ||
| 265 | conswitchp = &dummy_con; | ||
| 266 | #endif | ||
| 267 | mach_max_dma_address = 0xffffffff; | 264 | mach_max_dma_address = 0xffffffff; |
| 268 | 265 | ||
| 269 | if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) { | 266 | if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) { |