From cdf7f5a7b7fe4b003096d0a74960166b7e0ba239 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 30 Nov 2005 17:34:50 +0000 Subject: [PATCH] --- yaml --- r: 17152 b: refs/heads/master c: 52020d2bda9fe447bb50674a2e39e4064b6a10b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/powermac/udbg_adb.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2aee91230014..6e7dadb4d3df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bf6a8fa21570f37fd1789610da30f70a05ac5e3 +refs/heads/master: 52020d2bda9fe447bb50674a2e39e4064b6a10b5 diff --git a/trunk/arch/powerpc/platforms/powermac/udbg_adb.c b/trunk/arch/powerpc/platforms/powermac/udbg_adb.c index e51de55b2d6e..d1c40e27e37d 100644 --- a/trunk/arch/powerpc/platforms/powermac/udbg_adb.c +++ b/trunk/arch/powerpc/platforms/powermac/udbg_adb.c @@ -171,9 +171,12 @@ int udbg_adb_init(int force_btext) udbg_adb_old_getc_poll = udbg_getc_poll; /* Check if our early init was already called */ - if (udbg_adb_old_putc == udbg_adb_putc || - udbg_adb_old_putc == btext_drawchar) + if (udbg_adb_old_putc == udbg_adb_putc) udbg_adb_old_putc = NULL; +#ifdef CONFIG_BOOTX_TEXT + if (udbg_adb_old_putc == btext_drawchar) + udbg_adb_old_putc = NULL; +#endif /* Set ours as output */ udbg_putc = udbg_adb_putc;