From: Andy Whitcroft <apw@shadowen.org>
To: Paul Mackerras <paulus@samba.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, Anton Blanchard <anton@samba.org>,
linuxppc64-dev@ozlabs.org, Andy Whitcroft <apw@shadowen.org>
Subject: [PATCH 1/2] powerpc powermac adb fix dependancy on btext_drawchar
Date: Wed, 30 Nov 2005 17:34:50 +0000 [thread overview]
Message-ID: <20051130173450.GA851@shadowen.org> (raw)
In-Reply-To: exportbomb.1133372080@pinky
powerpc: powermac, adb fix dependancy on btext_drawchar
udbg_adb_init() has become dependant 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>
---
diff -upN reference/arch/powerpc/platforms/powermac/udbg_adb.c current/arch/powerpc/platforms/powermac/udbg_adb.c
--- reference/arch/powerpc/platforms/powermac/udbg_adb.c
+++ current/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;
next prev parent reply other threads:[~2005-11-30 17:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-30 4:31 2.6.15-rc3-mm1 Andrew Morton
2005-11-30 16:23 ` 2.6.15-rc3-mm1 Christoph Hellwig
2005-11-30 20:27 ` 2.6.15-rc3-mm1 Andrew Morton
2005-11-30 23:18 ` 2.6.15-rc3-mm1 Benjamin Herrenschmidt
2005-12-01 11:31 ` 2.6.15-rc3-mm1 Christoph Hellwig
2005-12-01 21:10 ` 2.6.15-rc3-mm1 Benjamin Herrenschmidt
2005-12-01 21:20 ` 2.6.15-rc3-mm1 Christoph Hellwig
2005-11-30 17:32 ` 2.6.15-rc3-mm1 Carlos Martín
2005-11-30 20:39 ` 2.6.15-rc3-mm1 Andrew Morton
2005-11-30 23:24 ` 2.6.15-rc3-mm1 Carlos Martín
2005-11-30 17:34 ` [PATCH 0/2] 2.6.15rc3mm1 ppc64 compile problems Andy Whitcroft
2005-11-30 17:34 ` Andy Whitcroft [this message]
2005-11-30 17:35 ` [PATCH 2/2] powerpc powermac adb fix udbg_adb_use_btext warning Andy Whitcroft
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051130173450.GA851@shadowen.org \
--to=apw@shadowen.org \
--cc=akpm@osdl.org \
--cc=anton@samba.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc64-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.