socfpga: fix include guard in misc.h (arch vs. global)
authorSimon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Wed, 23 Oct 2019 20:32:30 +0000 (22:32 +0200)
committerMarek Vasut <marex@denx.de>
Wed, 20 Nov 2019 21:32:00 +0000 (22:32 +0100)
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

index 27d0b6a370862ab2a03ddb80d13dd63182069a88..f11f907e1ce2c579ea5fc43ddf0f74353943ec25 100644 (file)
@@ -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_ */