On Mon, 30 Dec 2013 16:29:53 +0800 u74147@xxxxxxxxx wrote: > From: Du Huanpeng <u74147@xxxxxxxxx> > > without "#ifndef __ASSEMBLY__ #endif", an assembly file > including this file will break compilation. > > Signed-off-by: Du Huanpeng <u74147@xxxxxxxxx> > --- > arch/mips/include/asm/types.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h > index f5373cc..0341e8b 100644 > --- a/arch/mips/include/asm/types.h > +++ b/arch/mips/include/asm/types.h > @@ -13,6 +13,8 @@ > > #include <asm-generic/int-ll64.h> > > +#ifndef __ASSEMBLY__ > + > #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ > || defined(CONFIG_64BIT) > typedef u64 dma_addr_t; > @@ -21,6 +23,8 @@ typedef u32 dma_addr_t; > #endif > typedef u64 dma64_addr_t; > > +#endif Please change this '#endif' to '#endif /* __ASSEMBLY__ */' > + > /* > * We don't use int-l64.h for the kernel anymore but still use it for > * userspace to avoid code changes. > -- > 1.7.9.5 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox -- -- Best regards, Antony Pavlov _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
