diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:13:00 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:13:00 +0200 |
commit | 9ae21ca362679757786f5abe556c7943e9001426 (patch) | |
tree | db4ab371195fed9d327745eaf12c912f3f74f0e2 /arch/arm/mach-mx5/Makefile | |
parent | fix braino in fs: do not assign default i_ino in new_inode (diff) | |
parent | ARM: imx: Add wake functionality to GPIO (diff) | |
download | linux-9ae21ca362679757786f5abe556c7943e9001426.tar.xz linux-9ae21ca362679757786f5abe556c7943e9001426.zip |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx5/Makefile')
-rw-r--r-- | arch/arm/mach-mx5/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile index 1769c161a60d..462f177eddfe 100644 --- a/arch/arm/mach-mx5/Makefile +++ b/arch/arm/mach-mx5/Makefile @@ -5,6 +5,7 @@ # Object file lists. obj-y := cpu.o mm.o clock-mx51.o devices.o +obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o |