1 files changed, 3 insertions, 16 deletions

diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index 8ff86a766cdf..e7f695dcd8c8 100644
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
@@ -274,16 +274,6 @@ static void __pmac pmac_halt(void)
 }
 
 #ifdef CONFIG_BOOTX_TEXT
-static int dummy_getc_poll(void)
-{
-        return -1;
-}
-
-static unsigned char dummy_getc(void)
-{
-        return 0;
-}
-
 static void btext_putc(unsigned char c)
 {
         btext_drawchar(c);
@@ -342,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 = dummy_getc;
-                ppc_md.udbg_getc_poll = dummy_getc_poll;
-#endif /* CONFIG_BOOTX_TEXT */
+                udbg_putc = btext_putc;
         }
+#endif /* CONFIG_BOOTX_TEXT */
 
         /* Setup interrupt mapping options */
         ppc64_interrupt_controller = IC_OPEN_PIC;