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/plat-mxc/Makefile | |
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/plat-mxc/Makefile')
-rw-r--r-- | arch/arm/plat-mxc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index d53c35fe2ea..8939f79e670 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o +obj-$(CONFIG_CPU_IDLE) += cpuidle.o ifdef CONFIG_SND_IMX_SOC obj-y += ssi-fiq.o obj-y += ssi-fiq-ksym.o |