summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-17 16:47:32 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-17 16:47:32 +0000
commit9135f6db09aa9d186f05d41e9c516ec8e3550d78 (patch)
tree5deebbc7e9dd74a000f649e51d17e3f07c20b138 /arch/arm/plat-mxc/Makefile
parenta421296840379aee7d00ec4a28ecfe7e697a0a44 (diff)
parentb05f5c13d5bc2fa9945c9534f8881396555290a9 (diff)
Merge branch 'mxc-audio' into for-2.6.34
Conflicts: arch/arm/plat-mxc/Makefile (dual add) sound/soc/imx/mx27vis_wm8974.c (API updates & removal)
Diffstat (limited to 'arch/arm/plat-mxc/Makefile')
-rw-r--r--arch/arm/plat-mxc/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index 996cbac6932c..6cee38df58b2 100644
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -13,3 +13,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
obj-$(CONFIG_MXC_ULPI) += ulpi.o
obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
+ifdef CONFIG_SND_IMX_SOC
+obj-y += ssi-fiq.o
+obj-y += ssi-fiq-ksym.o
+endif