Skip to content

Commit

Permalink
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
Browse files Browse the repository at this point in the history
…linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] DEC: Remove call to register_prom_console.
  • Loading branch information
Linus Torvalds committed Mar 9, 2007
2 parents 6e96783 + 8960909 commit 30fbc9f
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions arch/mips/dec/prom/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) ||
Expand Down

0 comments on commit 30fbc9f

Please sign in to comment.