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/amiga | |
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/amiga')
-rw-r--r-- | arch/m68k/amiga/config.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index da24476db8e9..8eadde9d2a8f 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c | |||
@@ -431,9 +431,6 @@ void __init config_amiga(void) | |||
431 | mach_floppy_setup = amiga_floppy_setup; | 431 | mach_floppy_setup = amiga_floppy_setup; |
432 | #endif | 432 | #endif |
433 | mach_reset = amiga_reset; | 433 | mach_reset = amiga_reset; |
434 | #ifdef CONFIG_DUMMY_CONSOLE | ||
435 | conswitchp = &dummy_con; | ||
436 | #endif | ||
437 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) | 434 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) |
438 | mach_beep = amiga_mksound; | 435 | mach_beep = amiga_mksound; |
439 | #endif | 436 | #endif |