summaryrefslogtreecommitdiffstats
path: root/drivers/soundwire/Makefile
diff options
context:
space:
mode:
authorRander Wang <rander.wang@intel.com>2020-05-20 03:19:02 +0800
committerVinod Koul <vkoul@kernel.org>2020-05-20 19:24:55 +0530
commitfcbcf1f7b56855ffe1cec768cb1013c5a4c854c3 (patch)
tree8bd6856c1a91322d4963066d36f02b1c0bb1c221 /drivers/soundwire/Makefile
parent84091304a48c6d86a910b5a7d187592097da150f (diff)
downloadlinux-fcbcf1f7b56855ffe1cec768cb1013c5a4c854c3.tar.gz
linux-fcbcf1f7b56855ffe1cec768cb1013c5a4c854c3.tar.bz2
linux-fcbcf1f7b56855ffe1cec768cb1013c5a4c854c3.zip
soundwire: intel: use a single module
It's not clear why we have two modules for the Intel controller/master support when there is a single Kconfig. This adds complexity for no good reason, the two parts need to work together anyways. Signed-off-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20200519191903.6557-1-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/soundwire/Makefile')
-rw-r--r--drivers/soundwire/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile
index 9b0aeee94876..b5871612613b 100644
--- a/drivers/soundwire/Makefile
+++ b/drivers/soundwire/Makefile
@@ -17,12 +17,9 @@ soundwire-cadence-objs := cadence_master.o
obj-$(CONFIG_SOUNDWIRE_CADENCE) += soundwire-cadence.o
#Intel driver
-soundwire-intel-objs := intel.o
+soundwire-intel-objs := intel.o intel_init.o
obj-$(CONFIG_SOUNDWIRE_INTEL) += soundwire-intel.o
-soundwire-intel-init-objs := intel_init.o
-obj-$(CONFIG_SOUNDWIRE_INTEL) += soundwire-intel-init.o
-
#Qualcomm driver
soundwire-qcom-objs := qcom.o
obj-$(CONFIG_SOUNDWIRE_QCOM) += soundwire-qcom.o