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/cpu-imx25.c | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
| download | kernel_goldelico_gta04-89a4150331bc07014256714678ce8e9b238fc145.zip kernel_goldelico_gta04-89a4150331bc07014256714678ce8e9b238fc145.tar.gz kernel_goldelico_gta04-89a4150331bc07014256714678ce8e9b238fc145.tar.bz2 | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'arch/arm/mach-imx/cpu-imx25.c')
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx25.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/cpu-imx25.c b/arch/arm/mach-imx/cpu-imx25.c index 6914bcb..96ec64b 100644 --- a/arch/arm/mach-imx/cpu-imx25.c +++ b/arch/arm/mach-imx/cpu-imx25.c @@ -11,8 +11,9 @@ */ #include <linux/module.h> #include <linux/io.h> -#include <mach/hardware.h> -#include <mach/iim.h> + +#include "iim.h" +#include "hardware.h" static int mx25_cpu_rev = -1; |