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/atari | |
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/atari')
-rw-r--r-- | arch/m68k/atari/config.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 9261d2deeaf5..f6d266b5cc76 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c | |||
@@ -247,9 +247,6 @@ void __init config_atari(void) | |||
247 | #ifdef CONFIG_ATARI_FLOPPY | 247 | #ifdef CONFIG_ATARI_FLOPPY |
248 | mach_floppy_setup = atari_floppy_setup; | 248 | mach_floppy_setup = atari_floppy_setup; |
249 | #endif | 249 | #endif |
250 | #ifdef CONFIG_DUMMY_CONSOLE | ||
251 | conswitchp = &dummy_con; | ||
252 | #endif | ||
253 | mach_max_dma_address = 0xffffff; | 250 | mach_max_dma_address = 0xffffff; |
254 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) | 251 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) |
255 | mach_beep = atari_mksound; | 252 | mach_beep = atari_mksound; |