Commit c45b1342 authored by Shawn Guo's avatar Shawn Guo

ARM: imx: remove unnecessary inclusion from device-imx*.h

There is no need for device-imx*.h to include <soc>.h.  Remove them
and fix one indirect inclusion in mach-mx31ads.c.
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 267dd34c
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/mx1.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_imx_fb_data imx1_imx_fb_data; extern const struct imx_imx_fb_data imx1_imx_fb_data;
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/mx21.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data; extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data;
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/mx25.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_fec_data imx25_fec_data; extern const struct imx_fec_data imx25_fec_data;
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/mx27.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_fec_data imx27_fec_data; extern const struct imx_fec_data imx27_fec_data;
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/mx31.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data; extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data;
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/mx35.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_fec_data imx35_fec_data; extern const struct imx_fec_data imx35_fec_data;
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <mach/mx50.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[]; extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[];
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation. * Free Software Foundation.
*/ */
#include <mach/mx51.h>
#include <mach/devices-common.h> #include <mach/devices-common.h>
extern const struct imx_fec_data imx51_fec_data; extern const struct imx_fec_data imx51_fec_data;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/hardware.h>
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
#include <linux/mfd/wm8350/audio.h> #include <linux/mfd/wm8350/audio.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment