github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 04:56:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge remote-tracking branch 'soundwire/next' into tag/merge-20191018

Browse Source
This commit is contained in:
Pierre-Louis Bossart 2019-10-18 07:24:27 -05:00
commit 08c0d65fc1
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soundwire/Kconfig
View File

@ -24,7 +24,7 @@ config SOUNDWIRE_CADENCE
config SOUNDWIRE_INTEL
tristate "Intel SoundWire Master driver"
select SOUNDWIRE_CADENCE
depends on X86 && ACPI && SND_SOC
depends on ACPI && SND_SOC
help
SoundWire Intel Master driver.
If you have an Intel platform which has a SoundWire Master then

1
drivers/soundwire/intel.c
View File

@ -10,6 +10,7 @@
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>

1
drivers/soundwire/intel_init.c
View File

@ -9,6 +9,7 @@
#include <linux/acpi.h>
#include <linux/export.h>
#include <linux/iomap.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/soundwire/sdw_intel.h>