Skip to content

Commit

Permalink
[PATCH] powerpc: powermac adb fix dependency on btext_drawchar
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Whitcroft authored and Paul Mackerras committed Jan 9, 2006
1 parent 2bf6a8f commit 52020d2
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/powerpc/platforms/powermac/udbg_adb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 52020d2

Please sign in to comment.