aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Makefile
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
commit68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch)
tree5fb2d14340332062e416246c5759adcaa64a2340 /sound/soc/codecs/Makefile
parent17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff)
parentb99374450c03bf5081b88995d91d34fb9b2fd040 (diff)
downloadkernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'sound/soc/codecs/Makefile')
-rw-r--r--sound/soc/codecs/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 090ae93..9789e08 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -73,7 +73,11 @@ snd-soc-wm8988-objs := wm8988.o
snd-soc-wm8990-objs := wm8990.o
snd-soc-wm8991-objs := wm8991.o
snd-soc-wm8993-objs := wm8993.o
+ifeq ($(CONFIG_MACH_KONA),y)
+snd-soc-wm8994-objs := wm8994_kona.o wm8994-tables.o wm8958-dsp2.o
+else
snd-soc-wm8994-objs := wm8994.o wm8994-tables.o wm8958-dsp2.o
+endif
snd-soc-wm8995-objs := wm8995.o
snd-soc-wm9081-objs := wm9081.o
snd-soc-wm9705-objs := wm9705.o
@@ -173,6 +177,7 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
obj-$(CONFIG_SND_SOC_MC1N2) += mc1n2/
+obj-$(CONFIG_SND_SOC_YAMAHA_YMU831) += ymu831/
# Amp
obj-$(CONFIG_SND_SOC_LM4857) += snd-soc-lm4857.o