From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 2 Nov 2019 17:15:46 +0000 (+0100)
Subject: Merge tag 'soundwire-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Tag: v5.4-rc7~3^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=106901add52b6e79206c15563fcc0efe835f75bb;p=linux-2.6-block.git

Merge tag 'soundwire-5.4-rc6' of git://git./linux/kernel/git/vkoul/soundwire into char-misc-linus

Vinod writes:

soundwire fixes for v5.4-rc6

- Kconfig fixes to ensure soundwire is built only for ACPI and DT
  platform
- fix for intel PDI offsets and numbers
- slave scanf format fix

* tag 'soundwire-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: slave: fix scanf format
  soundwire: intel: fix intel_register_dai PDI offsets and numbers
  soundwire: depend on ACPI || OF
  soundwire: depend on ACPI
---

106901add52b6e79206c15563fcc0efe835f75bb