socfpga: fix include guard in misc.h (arch vs. global)
Subsystems (3)
PATCH 1/1 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 <[email protected]>
---
arch/arm/mach-socfpga/include/mach/misc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-socfpga/include/mach/misc.h +3 -3
@@ -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_ */
Signature · 1 line
2.20.1
PATCH 1/1 socfpga: fix include guard in misc.h (arch vs. global)
Quoted 7 lines · Simon Goldschmidt
The file
arch/arm/mach-socfpga/include/mach/misc.hused the same include
guard as the globalinclude/misc.h.Fix this by giving the arch file an arch prefix.
Signed-off-by Simon Goldschmidt <[email protected]>
Reviewed-by Ley Foon Tan <[email protected]>
Quoted 27 lines
---
arch/arm/mach-socfpga/include/mach/misc.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)arch/arm/mach-socfpga/include/mach/misc.h +0
-0@@ -3,8 +3,8 @@* Copyright (C) 2016-2017 Intel Corporation */ arch/arm/mach-socfpga/include/mach/misc.h +2
-2-#ifndef _MISC_H_ -#define _MISC_H_ +#ifndef _SOCFPGA_MISC_H_ +#define _SOCFPGA_MISC_H_
#include <asm/sections.h>arch/arm/mach-socfpga/include/mach/misc.h +0
-0@@ -42,4 +42,4 @@ void socfpga_sdram_remap_zero(void); void do_bridge_reset(int enable, unsigned int mask); void socfpga_pl310_clear(void);arch/arm/mach-socfpga/include/mach/misc.h +1
-1-#endif /* _MISC_H_ */ +#endif /* _SOCFPGA_MISC_H_ */