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/mach-mx50_rdp.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/mach-mx50_rdp.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx50_rdp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-mx50_rdp.c b/arch/arm/mach-imx/mach-mx50_rdp.c index 42b66e8d9615..0c1f88a80bdc 100644 --- a/arch/arm/mach-imx/mach-mx50_rdp.c +++ b/arch/arm/mach-imx/mach-mx50_rdp.c @@ -24,17 +24,16 @@ #include <linux/delay.h> #include <linux/io.h> -#include <mach/common.h> -#include <mach/hardware.h> -#include <mach/iomux-mx50.h> - #include <asm/irq.h> #include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "common.h" #include "devices-imx50.h" +#include "hardware.h" +#include "iomux-mx50.h" #define FEC_EN IMX_GPIO_NR(6, 23) #define FEC_RESET_B IMX_GPIO_NR(4, 12) |