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-imx21.h | |
parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
download | talos-obmc-linux-89a4150331bc07014256714678ce8e9b238fc145.tar.gz talos-obmc-linux-89a4150331bc07014256714678ce8e9b238fc145.zip |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'arch/arm/mach-imx/devices-imx21.h')
-rw-r--r-- | arch/arm/mach-imx/devices-imx21.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/devices-imx21.h b/arch/arm/mach-imx/devices-imx21.h index 93ece55f75df..bd9393280159 100644 --- a/arch/arm/mach-imx/devices-imx21.h +++ b/arch/arm/mach-imx/devices-imx21.h @@ -6,8 +6,7 @@ * 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> +#include "devices/devices-common.h" extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data; #define imx21_add_imx21_hcd(pdata) \ |