diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-08 10:02:30 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-08 10:45:23 -0500 |
commit | 3cdd54417d0f821825a353f7273d356399112f56 (patch) | |
tree | b19c992151e2dec4626761302b27ada179227f66 /arch/arm/plat-mxc/include/mach/mx1.h | |
parent | 4631166124d928d3e9372a57b1477ce6335332c5 (diff) |
imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion
Some headers have used (now) wrong names or havn't had protection at
all. This is needed before adding static inline functions to the
headers.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Daniel Mack <daniel@caiaq.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx1.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx1.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx1.h b/arch/arm/plat-mxc/include/mach/mx1.h index 1b2890a5c45..b652a9c2586 100644 --- a/arch/arm/plat-mxc/include/mach/mx1.h +++ b/arch/arm/plat-mxc/include/mach/mx1.h | |||
@@ -9,8 +9,8 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #ifndef __ASM_ARCH_MXC_MX1_H__ | 12 | #ifndef __MACH_MX1_H__ |
13 | #define __ASM_ARCH_MXC_MX1_H__ | 13 | #define __MACH_MX1_H__ |
14 | 14 | ||
15 | #include <mach/vmalloc.h> | 15 | #include <mach/vmalloc.h> |
16 | 16 | ||
@@ -161,4 +161,4 @@ | |||
161 | #define DMA_REQ_UART1_T 30 | 161 | #define DMA_REQ_UART1_T 30 |
162 | #define DMA_REQ_UART1_R 31 | 162 | #define DMA_REQ_UART1_R 31 |
163 | 163 | ||
164 | #endif /* __ASM_ARCH_MXC_MX1_H__ */ | 164 | #endif /* ifndef __MACH_MX1_H__ */ |