From b8553086288629b4efb77e97f5582e08bc50ad65 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 8 Jul 2000 00:53:00 +0000 Subject: Merge with 2.4.0-test3-pre4. --- kernel/printk.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'kernel/printk.c') diff --git a/kernel/printk.c b/kernel/printk.c index ca4b14ff9..ff6c727ab 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -471,6 +471,14 @@ int unregister_console(struct console * console) } } + /* If last console is removed, we re-enable picking the first + * one that gets registered. Without that, pmac early boot console + * would prevent fbcon from taking over. + */ + if (console_drivers == NULL) + preferred_console = -1; + + spin_unlock_irqrestore(&console_lock, flags); return res; } -- cgit v1.2.3