summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 20:39:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 20:39:13 +0100
commit9bafc74163d8bccca9810159aab39be926fb877c (patch)
treebaa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/plat-mxc/Makefile
parent8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff)
parentb3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff)
downloadlinux-9bafc74163d8bccca9810159aab39be926fb877c.tar.gz
linux-9bafc74163d8bccca9810159aab39be926fb877c.tar.bz2
linux-9bafc74163d8bccca9810159aab39be926fb877c.zip
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/plat-mxc/Makefile')
-rw-r--r--arch/arm/plat-mxc/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index 06875b4dd70f..372670952789 100644
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_MXC_USE_EPIT) += epit.o
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
ifdef CONFIG_SND_IMX_SOC
obj-y += ssi-fiq.o
obj-y += ssi-fiq-ksym.o