From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751482AbVK3Rfs (ORCPT ); Wed, 30 Nov 2005 12:35:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751486AbVK3RfH (ORCPT ); Wed, 30 Nov 2005 12:35:07 -0500 Received: from 81-179-233-34.dsl.pipex.com ([81.179.233.34]:34511 "EHLO localhost.localdomain") by vger.kernel.org with ESMTP id S1751483AbVK3RfE (ORCPT ); Wed, 30 Nov 2005 12:35:04 -0500 Date: Wed, 30 Nov 2005 17:34:50 +0000 To: Paul Mackerras , Andrew Morton Cc: linux-kernel@vger.kernel.org, Anton Blanchard , linuxppc64-dev@ozlabs.org, Andy Whitcroft Subject: [PATCH 1/2] powerpc powermac adb fix dependancy on btext_drawchar Message-ID: <20051130173450.GA851@shadowen.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline InReply-To: User-Agent: Mutt/1.5.9i From: Andy Whitcroft Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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;