diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2019-08-19 07:15:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2019-08-19 07:15:42 +0200 |
| commit | 7ffc95e90e305c6803991ec2a2f4e442236efc77 (patch) | |
| tree | 5018f8310d14bb4d8dd25813ae69827c557060a9 /drivers/base | |
| parent | usb: typec: fusb302: Call fusb302_debugfs_init earlier (diff) | |
| parent | Linux 5.3-rc5 (diff) | |
| download | linux-7ffc95e90e305c6803991ec2a2f4e442236efc77.tar.gz linux-7ffc95e90e305c6803991ec2a2f4e442236efc77.tar.bz2 linux-7ffc95e90e305c6803991ec2a2f4e442236efc77.zip | |
Merge 5.3-rc5 into usb-next
We need the usb fixes in here as well for other patches to build on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 |