From e6137a698c4c8e9840abb4da8513b8786363931a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 16 Aug 2013 12:27:27 +0200 Subject: [PATCH] ARM: i.MX23: Fix double include protection Using __ASM_MACH_IOMUX_H will break once we introduce a iomux.h which uses exactly this string as double include protection. Use a SoC specific string instead. Signed-off-by: Sascha Hauer --- arch/arm/mach-mxs/include/mach/iomux-imx23.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mxs/include/mach/iomux-imx23.h b/arch/arm/mach-mxs/include/mach/iomux-imx23.h index ebe0ac409..39d69810e 100644 --- a/arch/arm/mach-mxs/include/mach/iomux-imx23.h +++ b/arch/arm/mach-mxs/include/mach/iomux-imx23.h @@ -27,8 +27,8 @@ * ^_____________________ initial output value if enabled as GPIO and configured as output * ^______________________ Bit keeper present */ -#ifndef __ASM_MACH_IOMUX_H -#define __ASM_MACH_IOMUX_H +#ifndef __ASM_MACH_IOMUX_MX23_H +#define __ASM_MACH_IOMUX_MX23_H /* control pad's function */ #define FBIT_SHIFT (3) @@ -422,4 +422,4 @@ #define EMI_DQM0 (FUNC(0) | PORTF(7, 0) | SE | VE | PE) #define EMI_DQM0_DISABLED (FUNC(3) | PORTF(7, 0) | SE | VE | PE) -#endif /* __ASM_MACH_IOMUX_H */ +#endif /* __ASM_MACH_IOMUX_MX23_H */