On Wed, 2019-10-23 at 22:32 +0200, Simon Goldschmidt wrote: > The file arch/arm/mach-socfpga/include/mach/misc.h used the same > include > guard as the global include/misc.h. > > Fix this by giving the arch file an arch prefix. > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com> Reviewed-by: Ley Foon Tan <ley.foon....@intel.com>
> --- > > arch/arm/mach-socfpga/include/mach/misc.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-socfpga/include/mach/misc.h > b/arch/arm/mach-socfpga/include/mach/misc.h > index 27d0b6a370..f11f907e1c 100644 > --- a/arch/arm/mach-socfpga/include/mach/misc.h > +++ b/arch/arm/mach-socfpga/include/mach/misc.h > @@ -3,8 +3,8 @@ > * Copyright (C) 2016-2017 Intel Corporation > */ > > -#ifndef _MISC_H_ > -#define _MISC_H_ > +#ifndef _SOCFPGA_MISC_H_ > +#define _SOCFPGA_MISC_H_ > > #include <asm/sections.h> > > @@ -42,4 +42,4 @@ void socfpga_sdram_remap_zero(void); > void do_bridge_reset(int enable, unsigned int mask); > void socfpga_pl310_clear(void); > > -#endif /* _MISC_H_ */ > +#endif /* _SOCFPGA_MISC_H_ */ _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot