commit 52166715281b62fddbb46b740c6ce48d73e0b663
author Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Wed Oct 23 22:32:30 2019 +0200
committer Marek Vasut <marex@denx.de> Wed Nov 20 22:32:00 2019 +0100
tree 3c1253bfb2f4e946e206af46cc6a49620ba1370e
parent e87443363a6ced66429157484b46260a257d432d

socfpga: fix include guard in misc.h (arch vs. global)

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

diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h
index 27d0b6a..f11f907 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 do_bridge_reset(int enable, unsigned int mask);
 void socfpga_pl310_clear(void);
 
-#endif /* _MISC_H_ */
+#endif /* _SOCFPGA_MISC_H_ */