From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U1XrK-0003eJ-0Z for barebox@lists.infradead.org; Sat, 02 Feb 2013 07:49:59 +0000 Date: Sat, 2 Feb 2013 08:49:55 +0100 From: Sascha Hauer Message-ID: <20130202074955.GA1906@pengutronix.de> References: <1359654315-19183-1-git-send-email-plagnioj@jcrosoft.com> <20130201175536.GZ1906@pengutronix.de> <20130201180403.GM26329@game.jcrosoft.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130201180403.GM26329@game.jcrosoft.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 1/1] omap3: fix debug_ll uart base To: Jean-Christophe PLAGNIOL-VILLARD Cc: barebox@lists.infradead.org On Fri, Feb 01, 2013 at 07:04:03PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 18:55 Fri 01 Feb , Sascha Hauer wrote: > > On Thu, Jan 31, 2013 at 06:45:15PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > > > --- > > > arch/arm/mach-omap/include/mach/debug_ll.h | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/arm/mach-omap/include/mach/debug_ll.h b/arch/arm/mach-omap/include/mach/debug_ll.h > > > index 142f01a..ed1777b 100644 > > > --- a/arch/arm/mach-omap/include/mach/debug_ll.h > > > +++ b/arch/arm/mach-omap/include/mach/debug_ll.h > > > @@ -23,9 +23,9 @@ > > > #include > > > > > > #ifdef CONFIG_OMAP3EVM_UART1 > > > -#define UART_BASE OMAP_UART1_BASE > > > +#define UART_BASE OMAP3_UART1_BASE > > > #else > > > -#define UART_BASE OMAP_UART3_BASE > > > +#define UART_BASE OMAP3_UART3_BASE > > > #endif > > > > This file is also used for omap4 and am33xx. Probably this used to work > > when all shared the same defines. So, the above does not seem to be a > > proper fix. > it is as this is under as before > > you have > #ifdef CONFIG_ARCH_OMAP3 > #include Ah, missed that. Applied. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox