diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 19:38:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 19:38:09 +0100 |
| commit | 30fbc9f77c5a77f5f7f053d29eb92e41f6043406 (patch) | |
| tree | 4f50cab4a3f37133dc5c1c35ee0d10934276a23d | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| parent | [MIPS] DEC: Remove call to register_prom_console. (diff) | |
| download | linux-30fbc9f77c5a77f5f7f053d29eb92e41f6043406.tar.xz linux-30fbc9f77c5a77f5f7f053d29eb92e41f6043406.zip | |
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.
| -rw-r--r-- | arch/mips/dec/prom/init.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c index bf2858071f1f..a217aafe59f6 100644 --- 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) || |