aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilton Miller <miltonm@bga.com>2005-09-05 21:54:42 -0400
committerPaul Mackerras <paulus@samba.org>2005-09-06 02:07:35 -0400
commit5fdabaab01ee8928597aae8a0178a3a4f7b66365 (patch)
tree05b41db706498009da5ce3b4e779017e3470caba
parent41be31b7d61c661a63bb1d5c8be3c39f124beabd (diff)
[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)
274} 274}
275 275
276#ifdef CONFIG_BOOTX_TEXT 276#ifdef CONFIG_BOOTX_TEXT
277static int dummy_getc_poll(void)
278{
279 return -1;
280}
281
282static unsigned char dummy_getc(void)
283{
284 return 0;
285}
286
287static void btext_putc(unsigned char c) 277static void btext_putc(unsigned char c)
288{ 278{
289 btext_drawchar(c); 279 btext_drawchar(c);
@@ -348,8 +338,8 @@ static void __init pmac_init_early(void)
348 init_boot_display(); 338 init_boot_display();
349 339
350 ppc_md.udbg_putc = btext_putc; 340 ppc_md.udbg_putc = btext_putc;
351 ppc_md.udbg_getc = dummy_getc; 341 ppc_md.udbg_getc = NULL;
352 ppc_md.udbg_getc_poll = dummy_getc_poll; 342 ppc_md.udbg_getc_poll = NULL;
353#endif /* CONFIG_BOOTX_TEXT */ 343#endif /* CONFIG_BOOTX_TEXT */
354 } 344 }
355 345