From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/8] ARM: i.MX23: Fix double include protection
Date: Sat, 17 Aug 2013 11:25:32 +0200 [thread overview]
Message-ID: <1376731537-12102-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1376731537-12102-1-git-send-email-s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
---
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 ebe0ac4..39d6981 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 */
--
1.8.4.rc2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-08-17 9:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-17 9:25 [PATCH] cleanup gpio includes Sascha Hauer
2013-08-17 9:25 ` [PATCH 1/8] ARM: AT91: Add missing include Sascha Hauer
2013-08-17 9:25 ` [PATCH 2/8] ARM: include <gpio.h> instead of <mach/gpio.h> Sascha Hauer
2013-08-17 9:25 ` Sascha Hauer [this message]
2013-08-17 9:25 ` [PATCH 4/8] ARM: AT91: move iomux definitions to iomux.h Sascha Hauer
2013-08-17 9:25 ` [PATCH 5/8] ARM: MXS: " Sascha Hauer
2013-08-17 9:25 ` [PATCH 6/8] ARM: Samsung: " Sascha Hauer
2013-08-17 9:25 ` [PATCH 7/8] ARM: i.MX: " Sascha Hauer
2013-08-17 9:25 ` [PATCH 8/8] ARM: remove include of mach/gpio.h for gpiolib users Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376731537-12102-4-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox