aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2005-11-30 17:34:50 +0000
committerPaul Mackerras <paulus@samba.org>2006-01-09 14:51:15 +1100
commit52020d2bda9fe447bb50674a2e39e4064b6a10b5 (patch)
tree2924448f9f57874c6e2a778a971ff5a305b8cd42 /arch
parent2bf6a8fa21570f37fd1789610da30f70a05ac5e3 (diff)
[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 <apw@shadowen.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/powermac/udbg_adb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c
index e51de55b2d6..d1c40e27e37 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;