summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilton Miller <miltonm@bga.com>2005-09-06 11:54:42 +1000
committerPaul Mackerras <paulus@samba.org>2005-09-06 16:07:35 +1000
commit5fdabaab01ee8928597aae8a0178a3a4f7b66365 (patch)
tree05b41db706498009da5ce3b4e779017e3470caba
parent41be31b7d61c661a63bb1d5c8be3c39f124beabd (diff)
downloadlinux-stable-5fdabaab01ee8928597aae8a0178a3a4f7b66365.tar.gz
linux-stable-5fdabaab01ee8928597aae8a0178a3a4f7b66365.tar.bz2
linux-stable-5fdabaab01ee8928597aae8a0178a3a4f7b66365.zip
[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>
-rw-r--r--arch/ppc64/kernel/pmac_setup.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index 8ff86a766cdf..d94a3143527a 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 */
}