diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 13:38:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 13:38:09 -0500 |
commit | 30fbc9f77c5a77f5f7f053d29eb92e41f6043406 (patch) | |
tree | 4f50cab4a3f37133dc5c1c35ee0d10934276a23d /arch | |
parent | 6e96783f586cc0a64651087cb518209a8577123f (diff) | |
parent | 8960909ca71da6120cad2fd7ece7dbe32ae05b40 (diff) |
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.
Diffstat (limited to 'arch')
-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) | |||
103 | if (prom_is_rex(magic)) | 103 | if (prom_is_rex(magic)) |
104 | rex_clear_cache(); | 104 | rex_clear_cache(); |
105 | 105 | ||
106 | /* Register the early console. */ | ||
107 | register_prom_console(); | ||
108 | |||
109 | /* Were we compiled with the right CPU option? */ | 106 | /* Were we compiled with the right CPU option? */ |
110 | #if defined(CONFIG_CPU_R3000) | 107 | #if defined(CONFIG_CPU_R3000) |
111 | if ((current_cpu_data.cputype == CPU_R4000SC) || | 108 | if ((current_cpu_data.cputype == CPU_R4000SC) || |