Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933629Ab0D3Rt6 (ORCPT ); Fri, 30 Apr 2010 13:49:58 -0400 Received: from ksp.mff.cuni.cz ([195.113.26.206]:51853 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933617Ab0D3Rtx (ORCPT ); Fri, 30 Apr 2010 13:49:53 -0400 Date: Wed, 28 Apr 2010 08:08:26 +0200 From: Pavel Machek To: Peter Huewe Cc: David Brown , Daniel Walker , Bryan Huntsman , Russell King , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] arm/mach-msm: Add CONFIG conditional for board-trout Message-ID: <20100428060825.GE3721@ucw.cz> References: <201004290241.23068.PeterHuewe@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201004290241.23068.PeterHuewe@gmx.de> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1429 Lines: 44 On Thu 2010-04-29 02:41:22, Peter Huewe wrote: > From: Peter Huewe > > This patch adds a conditional for CONFIG_MSM_DEBUG_UART to prevent a > build failure[1], this is done the same way as for every board in mach-msm. > > References: > [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2448102/ > > Signed-off-by: Peter Huewe Ack. > --- > KernelVersion: linux-next-20100429 > > arch/arm/mach-msm/board-trout.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c > index 9793ff4..b88aec2 100644 > --- a/arch/arm/mach-msm/board-trout.c > +++ b/arch/arm/mach-msm/board-trout.c > @@ -82,8 +82,10 @@ static void __init trout_map_io(void) > } > > MACHINE_START(TROUT, "HTC Dream") > +#ifdef CONFIG_MSM_DEBUG_UART > .phys_io = MSM_DEBUG_UART_PHYS, > .io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc, > +#endif > .boot_params = 0x10000100, > .fixup = trout_fixup, > .map_io = trout_map_io, -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/