From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480AbVK3RfG (ORCPT ); Wed, 30 Nov 2005 12:35:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751488AbVK3RfF (ORCPT ); Wed, 30 Nov 2005 12:35:05 -0500 Received: from 81-179-233-34.dsl.pipex.com ([81.179.233.34]:35023 "EHLO localhost.localdomain") by vger.kernel.org with ESMTP id S1751482AbVK3RfE (ORCPT ); Wed, 30 Nov 2005 12:35:04 -0500 Date: Wed, 30 Nov 2005 17:35:01 +0000 To: Paul Mackerras , Andrew Morton Cc: linux-kernel@vger.kernel.org, Anton Blanchard , linuxppc64-dev@ozlabs.org, Andy Whitcroft Subject: [PATCH 2/2] powerpc powermac adb fix udbg_adb_use_btext warning Message-ID: <20051130173501.GA863@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 udbg_adb_use_btext warning When compiling without BOOTX_TEXT the following warning is emitted. Fix up the definition to only be made when required. CC arch/powerpc/platforms/powermac/udbg_adb.o .../arch/powerpc/platforms/powermac/udbg_adb.c:41: warning: `udbg_adb_use_btext' defined but not used 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 @@ -38,8 +38,6 @@ static enum { input_adb_cuda, } input_type = input_adb_none; -static int udbg_adb_use_btext; - int xmon_wants_key, xmon_adb_keycode; static inline void udbg_adb_poll(void) @@ -55,6 +53,8 @@ static inline void udbg_adb_poll(void) } #ifdef CONFIG_BOOTX_TEXT + +static int udbg_adb_use_btext; static int xmon_adb_shiftstate; static unsigned char xmon_keytab[128] =