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/mx21.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/mx21.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx21.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx21.h b/arch/arm/plat-mxc/include/mach/mx21.h index 5e2f16e59995..ed98b9c9f389 100644 --- a/arch/arm/plat-mxc/include/mach/mx21.h +++ b/arch/arm/plat-mxc/include/mach/mx21.h | |||
@@ -22,8 +22,8 @@ | |||
22 | * MA 02110-1301, USA. | 22 | * MA 02110-1301, USA. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #ifndef __ASM_ARCH_MXC_MX21_H__ | 25 | #ifndef __MACH_MX21_H__ |
26 | #define __ASM_ARCH_MXC_MX21_H__ | 26 | #define __MACH_MX21_H__ |
27 | 27 | ||
28 | #define MX21_AIPI_BASE_ADDR 0x10000000 | 28 | #define MX21_AIPI_BASE_ADDR 0x10000000 |
29 | #define MX21_AIPI_BASE_ADDR_VIRT 0xf4000000 | 29 | #define MX21_AIPI_BASE_ADDR_VIRT 0xf4000000 |
@@ -219,4 +219,4 @@ | |||
219 | #define DMA_REQ_BMI_RX MX21_DMA_REQ_BMI_RX | 219 | #define DMA_REQ_BMI_RX MX21_DMA_REQ_BMI_RX |
220 | #endif | 220 | #endif |
221 | 221 | ||
222 | #endif /* __ASM_ARCH_MXC_MX21_H__ */ | 222 | #endif /* ifndef __MACH_MX21_H__ */ |