From aa5200c4d881a32a4836fb959533116152682ff4 Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Wed, 25 Oct 2017 20:43:32 +0530 Subject: [PATCH] ASoC: tegra-alt: remove LKM hack Both t210 and t186 lkm_loader.sh script uses common xbar driver now. Hence the temporary fix can be removed now. Bug 200346429 Change-Id: I466ad9ed11b1418262a291aa6a414fa06b9014a2 Signed-off-by: Sameer Pujar Reviewed-on: https://git-master.nvidia.com/r/1585452 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Ravindra Lokhande Reviewed-by: Mohan Kumar D Reviewed-by: mobile promotions Tested-by: mobile promotions --- sound/soc/tegra-alt/Makefile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sound/soc/tegra-alt/Makefile b/sound/soc/tegra-alt/Makefile index 3594cef9..450732dc 100644 --- a/sound/soc/tegra-alt/Makefile +++ b/sound/soc/tegra-alt/Makefile @@ -23,12 +23,6 @@ obj-$(CONFIG_SND_SOC_TEGRA_ALT) += snd-soc-tegra-alt-utils.o #----------------------------- platform drivers ------------------------------------- snd-soc-tegra210-alt-admaif-objs := tegra210_admaif_alt.o snd-soc-tegra210-alt-xbar-objs := tegra210_xbar_alt.o - -# required to fool lkm loader (can be removed later) -ifeq ($(CONFIG_SND_SOC_TEGRA210_XBAR_ALT),m) - snd-soc-tegra186-alt-xbar-objs := tegra210_xbar_alt.o -endif - snd-soc-tegra210-alt-i2s-objs := tegra210_i2s_alt.o snd-soc-tegra210-alt-dmic-objs := tegra210_dmic_alt.o snd-soc-tegra210-alt-amx-objs := tegra210_amx_alt.o @@ -49,11 +43,6 @@ snd-soc-tegra210-alt-ope-objs := tegra210_ope_alt.o \ obj-$(CONFIG_SND_SOC_TEGRA210_ADMAIF_ALT) += snd-soc-tegra210-alt-admaif.o obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra210-alt-xbar.o - -ifeq ($(CONFIG_SND_SOC_TEGRA210_XBAR_ALT),m) - obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra186-alt-xbar.o -endif - obj-$(CONFIG_SND_SOC_TEGRA210_I2S_ALT) += snd-soc-tegra210-alt-i2s.o obj-$(CONFIG_SND_SOC_TEGRA210_DMIC_ALT) += snd-soc-tegra210-alt-dmic.o obj-$(CONFIG_SND_SOC_TEGRA210_AMX_ALT) += snd-soc-tegra210-alt-amx.o