From: Milton Miller <miltonm@bga.com>
Date: Tue, 6 Sep 2005 01:54:42 +0000 (+1000)
Subject: [PATCH] ppc64: Remove dummy getc routines
X-Git-Tag: v2.6.14-rc1~747^2~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5fdabaab01ee8928597aae8a0178a3a4f7b66365;p=linux-2.6-omap-h63xx.git

[PATCH] ppc64: Remove dummy getc routines

Now that xmon is fixed we should not need the dummy getc routines.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index 8ff86a766cd..d94a3143527 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);
@@ -348,8 +338,8 @@ static void __init pmac_init_early(void)
 		init_boot_display();
 
 		ppc_md.udbg_putc = btext_putc;
-		ppc_md.udbg_getc = dummy_getc;
-		ppc_md.udbg_getc_poll = dummy_getc_poll;
+		ppc_md.udbg_getc = NULL;
+		ppc_md.udbg_getc_poll = NULL;
 #endif /* CONFIG_BOOTX_TEXT */
 	}