diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 12:08:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 12:08:12 +0100 |
| commit | 53640f41b97792b0889bb70f26f99c06743162a1 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/mach-imx/mx31moboard-marxbot.c | |
| parent | Linux 3.7-rc5 (diff) | |
| parent | ARM: imx: select HAVE_IMX_SRC when SMP is enabled (diff) | |
| download | linux-53640f41b97792b0889bb70f26f99c06743162a1.tar.xz linux-53640f41b97792b0889bb70f26f99c06743162a1.zip | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
Diffstat (limited to 'arch/arm/mach-imx/mx31moboard-marxbot.c')
| -rw-r--r-- | arch/arm/mach-imx/mx31moboard-marxbot.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c index 135c90e3a45f..a4f43e90f3c1 100644 --- a/arch/arm/mach-imx/mx31moboard-marxbot.c +++ b/arch/arm/mach-imx/mx31moboard-marxbot.c @@ -24,14 +24,13 @@ #include <linux/usb/otg.h> -#include <mach/common.h> -#include <mach/hardware.h> -#include <mach/iomux-mx3.h> -#include <mach/ulpi.h> - #include <media/soc_camera.h> +#include "common.h" #include "devices-imx31.h" +#include "hardware.h" +#include "iomux-mx3.h" +#include "ulpi.h" static unsigned int marxbot_pins[] = { /* SDHC2 */ |