From f9e2080db5ade93df5ed15a434e0b4947a5ac376 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 13 Sep 2012 14:38:48 +0800
Subject: [PATCH] --- yaml --- r: 339733 b: refs/heads/master c:
 c45b1342b1d3ac144ccf55b377e5b70088fbaed2 h: refs/heads/master i:   339731:
 7bc820221a2473e487f9a0113d0539c62ba29b26 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-imx/devices-imx1.h  | 1 -
 trunk/arch/arm/mach-imx/devices-imx21.h | 1 -
 trunk/arch/arm/mach-imx/devices-imx25.h | 1 -
 trunk/arch/arm/mach-imx/devices-imx27.h | 1 -
 trunk/arch/arm/mach-imx/devices-imx31.h | 1 -
 trunk/arch/arm/mach-imx/devices-imx35.h | 1 -
 trunk/arch/arm/mach-imx/devices-imx50.h | 1 -
 trunk/arch/arm/mach-imx/devices-imx51.h | 1 -
 trunk/arch/arm/mach-imx/mach-mx31ads.c  | 1 +
 10 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 13f05c49d2ca..69e47159ee0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 267dd34c47a5b046ed500be17089983dc3d8158d
+refs/heads/master: c45b1342b1d3ac144ccf55b377e5b70088fbaed2
diff --git a/trunk/arch/arm/mach-imx/devices-imx1.h b/trunk/arch/arm/mach-imx/devices-imx1.h
index 3aad1e70de96..eb2603b59b5a 100644
--- a/trunk/arch/arm/mach-imx/devices-imx1.h
+++ b/trunk/arch/arm/mach-imx/devices-imx1.h
@@ -6,7 +6,6 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/mx1.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_imx_fb_data imx1_imx_fb_data;
diff --git a/trunk/arch/arm/mach-imx/devices-imx21.h b/trunk/arch/arm/mach-imx/devices-imx21.h
index 93ece55f75df..e2014daa52b4 100644
--- a/trunk/arch/arm/mach-imx/devices-imx21.h
+++ b/trunk/arch/arm/mach-imx/devices-imx21.h
@@ -6,7 +6,6 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/mx21.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data;
diff --git a/trunk/arch/arm/mach-imx/devices-imx25.h b/trunk/arch/arm/mach-imx/devices-imx25.h
index f8e03dd1f116..29e9706c24c2 100644
--- a/trunk/arch/arm/mach-imx/devices-imx25.h
+++ b/trunk/arch/arm/mach-imx/devices-imx25.h
@@ -6,7 +6,6 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/mx25.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_fec_data imx25_fec_data;
diff --git a/trunk/arch/arm/mach-imx/devices-imx27.h b/trunk/arch/arm/mach-imx/devices-imx27.h
index 04822932cdd1..e2250430b7dd 100644
--- a/trunk/arch/arm/mach-imx/devices-imx27.h
+++ b/trunk/arch/arm/mach-imx/devices-imx27.h
@@ -6,7 +6,6 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/mx27.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_fec_data imx27_fec_data;
diff --git a/trunk/arch/arm/mach-imx/devices-imx31.h b/trunk/arch/arm/mach-imx/devices-imx31.h
index 8b2ceb45bb83..20565f90e82c 100644
--- a/trunk/arch/arm/mach-imx/devices-imx31.h
+++ b/trunk/arch/arm/mach-imx/devices-imx31.h
@@ -6,7 +6,6 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/mx31.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data;
diff --git a/trunk/arch/arm/mach-imx/devices-imx35.h b/trunk/arch/arm/mach-imx/devices-imx35.h
index c3e9f206ac2b..e45b5cbaac96 100644
--- a/trunk/arch/arm/mach-imx/devices-imx35.h
+++ b/trunk/arch/arm/mach-imx/devices-imx35.h
@@ -6,7 +6,6 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/mx35.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_fec_data imx35_fec_data;
diff --git a/trunk/arch/arm/mach-imx/devices-imx50.h b/trunk/arch/arm/mach-imx/devices-imx50.h
index 7216667eaafc..1615a6ab40d9 100644
--- a/trunk/arch/arm/mach-imx/devices-imx50.h
+++ b/trunk/arch/arm/mach-imx/devices-imx50.h
@@ -18,7 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <mach/mx50.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[];
diff --git a/trunk/arch/arm/mach-imx/devices-imx51.h b/trunk/arch/arm/mach-imx/devices-imx51.h
index 9f1718725195..f448104837e2 100644
--- a/trunk/arch/arm/mach-imx/devices-imx51.h
+++ b/trunk/arch/arm/mach-imx/devices-imx51.h
@@ -6,7 +6,6 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/mx51.h>
 #include <mach/devices-common.h>
 
 extern const struct imx_fec_data imx51_fec_data;
diff --git a/trunk/arch/arm/mach-imx/mach-mx31ads.c b/trunk/arch/arm/mach-imx/mach-mx31ads.c
index ef3a01bac8ab..837839bb1597 100644
--- a/trunk/arch/arm/mach-imx/mach-mx31ads.c
+++ b/trunk/arch/arm/mach-imx/mach-mx31ads.c
@@ -29,6 +29,7 @@
 #include <asm/memory.h>
 #include <asm/mach/map.h>
 #include <mach/common.h>
+#include <mach/hardware.h>
 
 #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
 #include <linux/mfd/wm8350/audio.h>