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/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/mach-mx5/Makefile')
| -rw-r--r-- | arch/arm/mach-mx5/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile index 383e7cd3fbc..4471ce76e39 100644 --- a/arch/arm/mach-mx5/Makefile +++ b/arch/arm/mach-mx5/Makefile @@ -3,9 +3,8 @@ # # Object file lists. -obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o system.o +obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o system.o cpuidle.o obj-$(CONFIG_SOC_IMX50) += mm-mx50.o - obj-$(CONFIG_PM) += pm-imx5.o obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o |