aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSimon Goldschmidt2019-10-23 22:32:30 +0200
committerMarek Vasut2019-11-20 22:32:00 +0100
commit26fb85f4ab73cd57099d9058531f25b9cdf1c9a1 (patch)
tree3c1253bfb2f4e946e206af46cc6a49620ba1370e /arch/arm
parentaacd7b922f052a53c34e3b2d2c92bac27e16dad5 (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-socfpga/include/mach/misc.h6
1 files 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 27d0b6a3708..f11f907e1ce 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_ */