diff options
| author | Milton Miller <miltonm@bga.com> | 2005-09-06 11:56:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-06 16:07:36 +1000 |
| commit | c8f1c8be629ee34991fdba8bfe46a5c455393209 (patch) | |
| tree | 66f218e641e87a0ca9ade7601345229b6557761e /arch/ppc64/kernel/pmac_setup.c | |
| parent | 7f853352e79bf57c4ee279b7458ed0c072e2be76 (diff) | |
| download | op-kernel-dev-c8f1c8be629ee34991fdba8bfe46a5c455393209.zip op-kernel-dev-c8f1c8be629ee34991fdba8bfe46a5c455393209.tar.gz | |
[PATCH] ppc64: Take udbg out of ppc_md
Take udbg out of ppc_md. Allows us to not overwrite early udbg inits
when assigning ppc_md.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/pmac_setup.c')
| -rw-r--r-- | arch/ppc64/kernel/pmac_setup.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c index d94a314..e7f695d 100644 --- a/arch/ppc64/kernel/pmac_setup.c +++ b/arch/ppc64/kernel/pmac_setup.c @@ -332,16 +332,13 @@ static void __init pmac_init_early(void) sccdbg = 1; udbg_init_scc(NULL); } - - else { #ifdef CONFIG_BOOTX_TEXT + else { init_boot_display(); - ppc_md.udbg_putc = btext_putc; - ppc_md.udbg_getc = NULL; - ppc_md.udbg_getc_poll = NULL; -#endif /* CONFIG_BOOTX_TEXT */ + udbg_putc = btext_putc; } +#endif /* CONFIG_BOOTX_TEXT */ /* Setup interrupt mapping options */ ppc64_interrupt_controller = IC_OPEN_PIC; |
