summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/mx27.h
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-01-08 16:02:30 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-01-08 16:45:23 +0100
commit3cdd54417d0f821825a353f7273d356399112f56 (patch)
treeb19c992151e2dec4626761302b27ada179227f66 /arch/arm/plat-mxc/include/mach/mx27.h
parent4631166124d928d3e9372a57b1477ce6335332c5 (diff)
downloadblackbird-op-linux-3cdd54417d0f821825a353f7273d356399112f56.tar.gz
blackbird-op-linux-3cdd54417d0f821825a353f7273d356399112f56.zip
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/mx27.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/mx27.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h
index 62746c0cd5ce..832b5804dcb5 100644
--- a/arch/arm/plat-mxc/include/mach/mx27.h
+++ b/arch/arm/plat-mxc/include/mach/mx27.h
@@ -21,8 +21,8 @@
* MA 02110-1301, USA.
*/
-#ifndef __ASM_ARCH_MXC_MX27_H__
-#define __ASM_ARCH_MXC_MX27_H__
+#ifndef __MACH_MX27_H__
+#define __MACH_MX27_H__
#define MX27_AIPI_BASE_ADDR 0x10000000
#define MX27_AIPI_BASE_ADDR_VIRT 0xf4000000
@@ -300,4 +300,4 @@ extern int mx27_revision(void);
#define DMA_REQ_NFC MX27_DMA_REQ_NFC
#endif
-#endif /* __ASM_ARCH_MXC_MX27_H__ */
+#endif /* ifndef __MACH_MX27_H__ */
OpenPOWER on IntegriCloud