From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/8] ARM i.MX: remove SoC defines around header includes
Date: Thu, 19 May 2011 18:47:23 +0200 [thread overview]
Message-ID: <1305823648-2428-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1305823648-2428-1-git-send-email-s.hauer@pengutronix.de>
All soc specific header have proper namespace now and thus can
be included at once.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/plat-mxc/include/mach/hardware.h | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h
index 67d3e2b..a8bfd56 100644
--- a/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/arch/arm/plat-mxc/include/mach/hardware.h
@@ -97,35 +97,17 @@
#include <mach/mxc.h>
-#ifdef CONFIG_ARCH_MX5
#include <mach/mx50.h>
#include <mach/mx51.h>
#include <mach/mx53.h>
-#endif
-
-#ifdef CONFIG_ARCH_MX3
#include <mach/mx3x.h>
#include <mach/mx31.h>
#include <mach/mx35.h>
-#endif
-
-#ifdef CONFIG_ARCH_MX2
-# include <mach/mx2x.h>
-# ifdef CONFIG_MACH_MX21
-# include <mach/mx21.h>
-# endif
-# ifdef CONFIG_MACH_MX27
-# include <mach/mx27.h>
-# endif
-#endif
-
-#ifdef CONFIG_ARCH_MX1
-# include <mach/mx1.h>
-#endif
-
-#ifdef CONFIG_ARCH_MX25
-# include <mach/mx25.h>
-#endif
+#include <mach/mx2x.h>
+#include <mach/mx21.h>
+#include <mach/mx27.h>
+#include <mach/mx1.h>
+#include <mach/mx25.h>
#define imx_map_entry(soc, name, _type) { \
.virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR), \
--
1.7.4.1
next prev parent reply other threads:[~2011-05-19 16:47 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 16:47 i.MX consolidation patches Sascha Hauer
2011-05-19 16:47 ` [PATCH 1/8] ARM i.MX: fix last user of iomux.h and remove it Sascha Hauer
2011-05-19 16:47 ` [PATCH 2/8] ARM i.MX: define CLOCK_TICK_RATE to bogus value Sascha Hauer
2011-05-19 16:47 ` Sascha Hauer [this message]
2011-05-19 16:47 ` [PATCH 4/8] ARM i.MX: dmav1: kill SoC ifdefs Sascha Hauer
2011-05-19 16:47 ` [PATCH 5/8] ARM i.MX Allow to compile together i.MX1/21/25/27 Sascha Hauer
2011-05-19 18:04 ` Uwe Kleine-König
2011-05-19 19:03 ` Sascha Hauer
2011-05-19 19:44 ` Nicolas Pitre
2011-05-19 19:50 ` Sascha Hauer
2011-06-01 13:22 ` [PATCH 5/8 v2] " Sascha Hauer
2011-06-01 13:25 ` Russell King - ARM Linux
2011-06-01 15:24 ` Arnd Bergmann
2011-06-01 16:47 ` Sascha Hauer
2011-06-01 17:59 ` Arnd Bergmann
2011-05-19 16:47 ` [PATCH 6/8] ARM i.MX mxc.h: use CONFIG_SOC_* instead of CONFIG_ARCH_* Sascha Hauer
2011-05-19 16:47 ` [PATCH 7/8] ARM i.MX debug macro: " Sascha Hauer
2011-05-19 16:54 ` Sergei Shtylyov
2011-05-19 19:07 ` Sascha Hauer
2011-05-19 16:47 ` [PATCH 8/8] ARM: mxc: update defconfigs Sascha Hauer
2011-05-30 7:57 ` i.MX consolidation patches Shawn Guo
2011-06-01 12:35 ` Sascha Hauer
2011-06-01 13:47 ` Russell King - ARM Linux
2011-06-01 14:18 ` Sascha Hauer
2011-06-01 14:24 ` Russell King - ARM Linux
2011-06-01 14:36 ` Sascha Hauer
2011-06-01 14:59 ` Uwe Kleine-König
2011-06-22 7:56 ` Sascha Hauer
2011-06-22 8:11 ` Russell King - ARM Linux
2011-06-22 8:32 ` Sascha Hauer
2011-06-22 9:03 ` Russell King - ARM Linux
2011-06-22 14:58 ` Sascha Hauer
2011-06-22 15:10 ` Arnd Bergmann
2011-06-22 15:14 ` Russell King - ARM Linux
2011-06-22 15:23 ` Arnd Bergmann
2011-06-22 15:22 ` Russell King - ARM Linux
2011-06-22 16:35 ` Sascha Hauer
2011-06-01 21:08 ` Wolfgang Denk
2011-06-01 23:04 ` Matt Sealey
2011-06-02 10:34 ` Sascha Hauer
2011-06-02 11:23 ` Russell King - ARM Linux
2011-06-02 15:46 ` Wolfgang Denk
2011-06-02 23:59 ` Matt Sealey
2011-06-03 12:02 ` Sascha Hauer
2011-06-03 12:17 ` Wolfgang Denk
2011-06-03 14:18 ` 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=1305823648-2428-4-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=linux-arm-kernel@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;
as well as URLs for NNTP newsgroup(s).