diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-19 16:50:42 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-19 16:50:42 -0400 |
| commit | 0d04279d7443de8a98ced62732d1d834d5f005d5 (patch) | |
| tree | 9f0eb0c49a074abc53d56ccf7dc55c04fb918779 /arch/arm/mach-mx5/mm.c | |
| parent | 2972bf78c18e5084a90980cbba106f53a09427ab (diff) | |
| parent | 27b98ed0c5f3e22bf12e1ef5d4eddff06c1a021d (diff) | |
Merge branch 'imx_mx5_mx51' of git://git.linaro.org/people/rob_lee/imx_cpuidle into linaro-3.1linux-linaro-3.1-2011.10-1
Diffstat (limited to 'arch/arm/mach-mx5/mm.c')
| -rw-r--r-- | arch/arm/mach-mx5/mm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index baea6e5cddd..29bb785a398 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c @@ -20,6 +20,8 @@ #include <mach/common.h> #include <mach/devices-common.h> #include <mach/iomux-v3.h> +#include <mach/cpuidle.h> +#include "cpuidle.h" /* * Define the MX51 memory map. @@ -148,6 +150,8 @@ void __init imx51_soc_init(void) /* i.mx51 has the i.mx35 type sdma */ imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); + + imx_cpuidle_init(&mx5_cpuidle_data); } void __init imx53_soc_init(void) |