[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>

1 files changed, 3 insertions, 6 deletions

diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index d94a3143527a..e7f695dcd8c8 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;