aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/pmac_setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc64/kernel/pmac_setup.c')
-rw-r--r--arch/ppc64/kernel/pmac_setup.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index d94a3143527..e7f695dcd8c 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)
332 sccdbg = 1; 332 sccdbg = 1;
333 udbg_init_scc(NULL); 333 udbg_init_scc(NULL);
334 } 334 }
335
336 else {
337#ifdef CONFIG_BOOTX_TEXT 335#ifdef CONFIG_BOOTX_TEXT
336 else {
338 init_boot_display(); 337 init_boot_display();
339 338
340 ppc_md.udbg_putc = btext_putc; 339 udbg_putc = btext_putc;
341 ppc_md.udbg_getc = NULL;
342 ppc_md.udbg_getc_poll = NULL;
343#endif /* CONFIG_BOOTX_TEXT */
344 } 340 }
341#endif /* CONFIG_BOOTX_TEXT */
345 342
346 /* Setup interrupt mapping options */ 343 /* Setup interrupt mapping options */
347 ppc64_interrupt_controller = IC_OPEN_PIC; 344 ppc64_interrupt_controller = IC_OPEN_PIC;