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/sun3x/config.c | |
| 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/sun3x/config.c')
| -rw-r--r-- | arch/m68k/sun3x/config.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index 0ef547f5494d..0920f5d33606 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c | |||
| @@ -71,10 +71,6 @@ void __init config_sun3x(void) | |||
| 71 | mach_get_model = sun3_get_model; | 71 | mach_get_model = sun3_get_model; |
| 72 | mach_get_hardware_list = sun3x_get_hardware_list; | 72 | mach_get_hardware_list = sun3x_get_hardware_list; |
| 73 | 73 | ||
| 74 | #ifdef CONFIG_DUMMY_CONSOLE | ||
| 75 | conswitchp = &dummy_con; | ||
| 76 | #endif | ||
| 77 | |||
| 78 | sun3_intreg = (unsigned char *)SUN3X_INTREG; | 74 | sun3_intreg = (unsigned char *)SUN3X_INTREG; |
| 79 | 75 | ||
| 80 | /* only the serial console is known to work anyway... */ | 76 | /* only the serial console is known to work anyway... */ |