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.

-3
-3
arch/mips/dec/prom/init.c
··· 103 if (prom_is_rex(magic)) 104 rex_clear_cache(); 105 106 - /* Register the early console. */ 107 - register_prom_console(); 108 - 109 /* Were we compiled with the right CPU option? */ 110 #if defined(CONFIG_CPU_R3000) 111 if ((current_cpu_data.cputype == CPU_R4000SC) ||
··· 103 if (prom_is_rex(magic)) 104 rex_clear_cache(); 105 106 /* Were we compiled with the right CPU option? */ 107 #if defined(CONFIG_CPU_R3000) 108 if ((current_cpu_data.cputype == CPU_R4000SC) ||