mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-19 02:04:19 +08:00
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.
This commit is contained in:
commit
30fbc9f77c
@ -103,9 +103,6 @@ void __init prom_init(void)
|
|||||||
if (prom_is_rex(magic))
|
if (prom_is_rex(magic))
|
||||||
rex_clear_cache();
|
rex_clear_cache();
|
||||||
|
|
||||||
/* Register the early console. */
|
|
||||||
register_prom_console();
|
|
||||||
|
|
||||||
/* Were we compiled with the right CPU option? */
|
/* Were we compiled with the right CPU option? */
|
||||||
#if defined(CONFIG_CPU_R3000)
|
#if defined(CONFIG_CPU_R3000)
|
||||||
if ((current_cpu_data.cputype == CPU_R4000SC) ||
|
if ((current_cpu_data.cputype == CPU_R4000SC) ||
|
||||||
|
Loading…
Reference in New Issue
Block a user