diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/amiga/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/apollo/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/atari/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/hp300/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/kernel/setup.c | 4 | ||||
-rw-r--r-- | arch/m68k/mac/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/q40/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/sun3/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/sun3x/config.c | 4 |
9 files changed, 4 insertions, 25 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 |
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 264929471253..d401962d9b25 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c | |||
@@ -176,9 +176,6 @@ void config_apollo(void) { | |||
176 | mach_set_clock_mmss = dn_dummy_set_clock_mmss; /* */ | 176 | mach_set_clock_mmss = dn_dummy_set_clock_mmss; /* */ |
177 | mach_process_int = dn_process_int; | 177 | mach_process_int = dn_process_int; |
178 | mach_reset = dn_dummy_reset; /* */ | 178 | mach_reset = dn_dummy_reset; /* */ |
179 | #ifdef CONFIG_DUMMY_CONSOLE | ||
180 | conswitchp = &dummy_con; | ||
181 | #endif | ||
182 | #ifdef CONFIG_HEARTBEAT | 179 | #ifdef CONFIG_HEARTBEAT |
183 | mach_heartbeat = dn_heartbeat; | 180 | mach_heartbeat = dn_heartbeat; |
184 | #endif | 181 | #endif |
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; |
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) { |
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index c4d4d0523932..583526fa59c7 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c | |||
@@ -282,6 +282,10 @@ void __init setup_arch(char **cmdline_p) | |||
282 | } | 282 | } |
283 | } | 283 | } |
284 | 284 | ||
285 | #ifdef CONFIG_DUMMY_CONSOLE | ||
286 | conswitchp = &dummy_con; | ||
287 | #endif | ||
288 | |||
285 | switch (m68k_machtype) { | 289 | switch (m68k_machtype) { |
286 | #ifdef CONFIG_AMIGA | 290 | #ifdef CONFIG_AMIGA |
287 | case MACH_AMIGA: | 291 | case MACH_AMIGA: |
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; |
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index 02b626bae4ae..67e88a4efac0 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c | |||
@@ -194,9 +194,6 @@ void __init config_q40(void) | |||
194 | mach_heartbeat = q40_heartbeat; | 194 | mach_heartbeat = q40_heartbeat; |
195 | #endif | 195 | #endif |
196 | mach_halt = q40_halt; | 196 | mach_halt = q40_halt; |
197 | #ifdef CONFIG_DUMMY_CONSOLE | ||
198 | conswitchp = &dummy_con; | ||
199 | #endif | ||
200 | 197 | ||
201 | /* disable a few things that SMSQ might have left enabled */ | 198 | /* disable a few things that SMSQ might have left enabled */ |
202 | q40_disable_irqs(); | 199 | q40_disable_irqs(); |
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 77d05bcc3221..f1ca0dfbaa67 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c | |||
@@ -160,9 +160,6 @@ void __init config_sun3(void) | |||
160 | mach_hwclk = sun3_hwclk; | 160 | mach_hwclk = sun3_hwclk; |
161 | mach_halt = sun3_halt; | 161 | mach_halt = sun3_halt; |
162 | mach_get_hardware_list = sun3_get_hardware_list; | 162 | mach_get_hardware_list = sun3_get_hardware_list; |
163 | #if defined(CONFIG_DUMMY_CONSOLE) | ||
164 | conswitchp = &dummy_con; | ||
165 | #endif | ||
166 | 163 | ||
167 | memory_start = ((((int)&_end) + 0x2000) & ~0x1fff); | 164 | memory_start = ((((int)&_end) + 0x2000) & ~0x1fff); |
168 | // PROM seems to want the last couple of physical pages. --m | 165 | // PROM seems to want the last couple of physical pages. --m |
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... */ |