Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] DEC: Remove call to register_prom_console.

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] DEC: Remove call to register_prom_console.
30fbc9f7 · Linus Torvalds · 6e96783f · 8960909c · 30fbc9f7
Commit 30fbc9f7 authored Mar 09, 2007 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

arch/mips/dec/prom/init.c arch/mips/dec/prom/init.c +0 -3

No files found.
--- a/arch/mips/dec/prom/init.c
+++ b/arch/mips/dec/prom/init.c
@@ -103,9 +103,6 @@ void __init prom_init(void)
 	if (prom_is_rex(magic))
 		rex_clear_cache();

-	/* Register the early console.  */
-	register_prom_console();
-
 	/* Were we compiled with the right CPU option? */
 #if defined(CONFIG_CPU_R3000)
 	if ((current_cpu_data.cputype == CPU_R4000SC) ||