From da2f1708ea2b2baaffc8d5b33db99df6aee9230f Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 9 May 2011 18:38:51 +0200
Subject: [PATCH] --- yaml --- r: 258679 b: refs/heads/master c:
 db279c1b8dc8b7da9d8de94a0ce103c0b9b8e1ae h: refs/heads/master i:   258677:
 b8cdb000085091f4ff2bd675d0017c0cb2e21c52   258675:
 136faa7f8bacaf8f00939b8691fed29f82bd3b48   258671:
 c3f161e68cd489e375a4c628475eaefd3d99cf07 v: v3

---
 [refs]                                        |  2 +-
 .../arch/arm/plat-mxc/include/mach/hardware.h | 28 ++++---------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 973845637a34..068615ba08f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a145baa1a499845103cd566ee5fe509e042aa80
+refs/heads/master: db279c1b8dc8b7da9d8de94a0ce103c0b9b8e1ae
diff --git a/trunk/arch/arm/plat-mxc/include/mach/hardware.h b/trunk/arch/arm/plat-mxc/include/mach/hardware.h
index 67d3e2bed065..a8bfd565dcad 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/trunk/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),	\