patch-2.4.20 linux-2.4.20/arch/m68k/sun3/config.c
Next file: linux-2.4.20/arch/m68k/sun3/mmu_emu.c
Previous file: linux-2.4.20/arch/m68k/q40/config.c
Back to the patch index
Back to the overall index
- Lines: 31
- Date:
Thu Nov 28 15:53:09 2002
- Orig file:
linux-2.4.19/arch/m68k/sun3/config.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/m68k/sun3/config.c linux-2.4.20/arch/m68k/sun3/config.c
@@ -141,7 +141,9 @@
mach_default_handler = &sun3_default_handler;
mach_request_irq = sun3_request_irq;
mach_free_irq = sun3_free_irq;
+#ifdef CONFIG_VT
// mach_keyb_init = sun3_keyb_init;
+#endif
enable_irq = sun3_enable_irq;
disable_irq = sun3_disable_irq;
mach_process_int = sun3_process_int;
@@ -152,7 +154,7 @@
mach_get_model = sun3_get_model;
mach_hwclk = sun3_hwclk;
mach_halt = sun3_halt;
-#if !defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_FB)
+#if !defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_DUMMY_CONSOLE)
conswitchp = &dummy_con;
#endif
@@ -165,9 +167,9 @@
sun3_bootmem_alloc(memory_start, memory_end);
+#ifdef CONFIG_SUN3X_ZS
sun_serial_setup();
-
-
+#endif
}
void __init sun3_sched_init(void (*timer_routine)(int, void *, struct pt_regs *))
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)