diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 16:21:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 16:21:27 +0100 |
| commit | 89a4150331bc07014256714678ce8e9b238fc145 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/mach-imx/devices-imx35.h | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
| download | linux-3.10-89a4150331bc07014256714678ce8e9b238fc145.tar.gz linux-3.10-89a4150331bc07014256714678ce8e9b238fc145.tar.bz2 linux-3.10-89a4150331bc07014256714678ce8e9b238fc145.zip | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'arch/arm/mach-imx/devices-imx35.h')
| -rw-r--r-- | arch/arm/mach-imx/devices-imx35.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/devices-imx35.h b/arch/arm/mach-imx/devices-imx35.h index c3e9f206ac2..e2675f1b141 100644 --- a/arch/arm/mach-imx/devices-imx35.h +++ b/arch/arm/mach-imx/devices-imx35.h @@ -6,8 +6,7 @@ * 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> +#include "devices/devices-common.h" extern const struct imx_fec_data imx35_fec_data; #define imx35_add_fec(pdata) \ |