mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-08 12:58:12 -04:00
[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>
This commit is contained in:
parent
2bf6a8fa21
commit
52020d2bda
1 changed files with 5 additions and 2 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue