Merge tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux] / drivers / base / regmap / Kconfig

diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
index cc162b4..aff34c0 100644 (file)
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -6,7 +6,6 @@
 config REGMAP
        default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
        select IRQ_DOMAIN if REGMAP_IRQ
-       select REGMAP_HWSPINLOCK if HWSPINLOCK=y
        bool
 
 config REGCACHE_COMPRESSED
@@ -43,5 +42,6 @@ config REGMAP_MMIO
 config REGMAP_IRQ
        bool
 
-config REGMAP_HWSPINLOCK
-       bool
+config REGMAP_SOUNDWIRE
+       tristate
+       depends on SOUNDWIRE_BUS