diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /arch/m68k/apollo | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'arch/m68k/apollo')
| -rw-r--r-- | arch/m68k/apollo/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 2ad8f9c24..4c620f23e 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -14,7 +14,6 @@ #include <asm/irq.h> #include <asm/machdep.h> -extern struct consw fb_con; extern void dn_sched_init(void (*handler)(int,void *,struct pt_regs *)); extern int dn_keyb_init(void); extern int dn_dummy_kbdrate(struct kbd_repeat *); @@ -110,7 +109,9 @@ void config_apollo(void) { mach_floppy_setup = dn_dummy_floppy_setup; #endif mach_reset = dn_dummy_reset; /* */ - conswitchp = &fb_con; +#ifdef CONFIG_DUMMY_CONSOLE + conswitchp = &dummy_con; +#endif #if 0 mach_fb_init = dn_fb_init; mach_video_setup = dn_dummy_video_setup; |