From: Andy Whitcroft Date: Wed, 30 Nov 2005 17:34:50 +0000 (+0000) Subject: [PATCH] powerpc: powermac adb fix dependency on btext_drawchar X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=52020d2bda9fe447bb50674a2e39e4064b6a10b5;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [PATCH] powerpc: powermac adb fix dependency on btext_drawchar udbg_adb_init() has become dependent on btext_drawchar, even when BOOTX_TEXT support is not selected. This leads to the error below. Make the check dependant on BOOTX_TEXT. LD .tmp_vmlinux1 arch/powerpc/platforms/built-in.o(.toc1+0xa40): undefined reference to `btext_drawchar' Signed-off-by: Andy Whitcroft Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c index e51de55b2d6e..d1c40e27e37d 100644 --- a/arch/powerpc/platforms/powermac/udbg_adb.c +++ b/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;