merge opensource jb u5

Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2

1 files changed, 16 insertions, 0 deletions

diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index f8a7d95..5891ebe 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -44,8 +44,16 @@ snd-soc-smdk-spdif-objs := smdk_spdif.o
 snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o
 snd-soc-speyside-objs := speyside.o
 snd-soc-u1-mc1n2-objs := u1_mc1n2.o
+snd-soc-slp-trats-mc1n2-objs := slp_trats_mc1n2.o
+snd-soc-slp-jack-objs := slp_jack.o
 snd-soc-midas-wm1811-objs := midas_wm1811.o
+snd-soc-t0-wm1811-objs := t0_wm1811.o
+snd-soc-t0duos-wm1811-objs := t0duos_wm1811.o
+snd-soc-m3-wm1811-objs := m3_wm1811.o
+snd-soc-slp-exynos-wm1811-objs := slp_exynos_wm1811.o
+snd-soc-slp-naples-wm1811-objs := slp_naples_wm1811.o
 snd-soc-lungo-wm1811-objs := lungo_wm1811.o
+snd-soc-grande-wm1811-objs := grande_wm1811.o
 
 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
@@ -67,8 +75,16 @@ obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
 obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o
 obj-$(CONFIG_SND_SOC_SPEYSIDE) += snd-soc-speyside.o
 obj-$(CONFIG_SND_SOC_U1_MC1N2) += snd-soc-u1-mc1n2.o
+obj-$(CONFIG_SND_SOC_SLP_TRATS_MC1N2) += snd-soc-slp-trats-mc1n2.o
+obj-$(CONFIG_SND_SOC_SLP_TRATS_MC1N2) += snd-soc-slp-jack.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811) += snd-soc-midas-wm1811.o
+obj-$(CONFIG_SND_SOC_SAMSUNG_T0_WM1811) += snd-soc-t0-wm1811.o
+obj-$(CONFIG_SND_SOC_SAMSUNG_T0DUOS_WM1811) += snd-soc-t0duos-wm1811.o
+obj-$(CONFIG_SND_SOC_SAMSUNG_M3_WM1811) += snd-soc-m3-wm1811.o
+obj-$(CONFIG_SND_SOC_SAMSUNG_SLP_EXYNOS_WM1811) += snd-soc-slp-exynos-wm1811.o
+obj-$(CONFIG_SND_SOC_SAMSUNG_SLP_NAPLES_WM1811) += snd-soc-slp-naples-wm1811.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_LUNGO_WM1811) += snd-soc-midas-wm1811.o
+obj-$(CONFIG_SND_SOC_SAMSUNG_GRANDE_WM1811) += snd-soc-grande-wm1811.o
 
 obj-$(CONFIG_SND_SAMSUNG_RP)   += srp_ulp/
 obj-$(CONFIG_SND_SAMSUNG_ALP)   += srp_alp/