From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ley Foon Tan <ley.foon.tan@intel.com>
Date: Thu, 24 Oct 2019 10:22:03 +0800
Subject: [U-Boot] [PATCH] socfpga: fix include guard in misc.h (arch vs.
	global)
In-Reply-To: <20191023203230.8815-1-simon.k.r.goldschmidt@gmail.com>
References: <20191023203230.8815-1-simon.k.r.goldschmidt@gmail.com>
Message-ID: <1571883723.2504.13.camel@intel.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
To: u-boot@lists.denx.de

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.goldschmidt@gmail.com>
Reviewed-by: Ley Foon Tan <ley.foon.tan@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_ */