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 <plagnioj@xxxxxxxxxxxx> > > > --- > > > 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 <mach/omap3-silicon.h> > > > > > > #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 <mach/omap3-silicon.h> 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@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
