diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-16 12:35:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-16 12:35:56 +0200 |
| commit | 9cd02b09a0f4439e5323c20b710331771c2b6341 (patch) | |
| tree | f40633176eaa74a07d8210815b986ce962d91e6e /drivers/base | |
| parent | 01fd150f4aff5bee03db5bda3b94c1bdbe9c6375 (diff) | |
| parent | 8676b3ca4673517650fd509d7fa586aff87b3c28 (diff) | |
Merge tag 'soundwire-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-linus
Vinod writes:
soundwire fixes for v5.3-rc5
Pierre sent fixes which are queued now for v5.3-rc5 are:
- regmap dependecy
- cadence register definitions
* tag 'soundwire-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
soundwire: fix regmap dependencies and align with other serial links
soundwire: cadence_master: fix definitions for INTSTAT0/1
soundwire: cadence_master: fix register definition for SLAVE_STATE
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig index a4984136c19d..0fd6f97ee523 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -44,7 +44,7 @@ config REGMAP_IRQ config REGMAP_SOUNDWIRE tristate - depends on SOUNDWIRE_BUS + depends on SOUNDWIRE config REGMAP_SCCB tristate |