summaryrefslogtreecommitdiffstats
path: root/drivers/soundwire/Makefile
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2019-07-18 18:02:15 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-07 18:59:39 +0200
commite4875cfb207fd2e4ca0edd5edc3bf5a4b4f060b8 (patch)
treea79209e52444562b56f11724ce074e4570082be7 /drivers/soundwire/Makefile
parent4558078231918cc99b11d265a76de54623e18d71 (diff)
downloadlinux-stable-e4875cfb207fd2e4ca0edd5edc3bf5a4b4f060b8.tar.gz
linux-stable-e4875cfb207fd2e4ca0edd5edc3bf5a4b4f060b8.tar.bz2
linux-stable-e4875cfb207fd2e4ca0edd5edc3bf5a4b4f060b8.zip
soundwire: fix regmap dependencies and align with other serial links
[ Upstream commit 8676b3ca4673517650fd509d7fa586aff87b3c28 ] The existing code has a mixed select/depend usage which makes no sense. config SOUNDWIRE_BUS tristate select REGMAP_SOUNDWIRE config REGMAP_SOUNDWIRE tristate depends on SOUNDWIRE_BUS Let's remove one layer of Kconfig definitions and align with the solutions used by all other serial links. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20190718230215.18675-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/soundwire/Makefile')
-rw-r--r--drivers/soundwire/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile
index fd99a831b92a..45b7e5001653 100644
--- a/drivers/soundwire/Makefile
+++ b/drivers/soundwire/Makefile
@@ -5,7 +5,7 @@
#Bus Objs
soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o
-obj-$(CONFIG_SOUNDWIRE_BUS) += soundwire-bus.o
+obj-$(CONFIG_SOUNDWIRE) += soundwire-bus.o
#Cadence Objs
soundwire-cadence-objs := cadence_master.o