diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-17 11:47:32 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-17 11:47:32 -0500 |
| commit | 9135f6db09aa9d186f05d41e9c516ec8e3550d78 (patch) | |
| tree | 5deebbc7e9dd74a000f649e51d17e3f07c20b138 /arch/arm/plat-mxc/Makefile | |
| parent | a421296840379aee7d00ec4a28ecfe7e697a0a44 (diff) | |
| parent | b05f5c13d5bc2fa9945c9534f8881396555290a9 (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/Makefile | 4 |
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 | |||
| 13 | obj-$(CONFIG_MXC_ULPI) += ulpi.o | 13 | obj-$(CONFIG_MXC_ULPI) += ulpi.o |
| 14 | obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o | 14 | obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o |
| 15 | obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o | 15 | obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o |
| 16 | ifdef CONFIG_SND_IMX_SOC | ||
| 17 | obj-y += ssi-fiq.o | ||
| 18 | obj-y += ssi-fiq-ksym.o | ||
| 19 | endif | ||