diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-01-10 11:51:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-10 11:51:21 +0000 |
| commit | 23534b197159dd07d3e02d4afd7fca3243d30bce (patch) | |
| tree | f8d30b457150a3e646ac809e263f037f0eb92fc4 /sound/soc/intel/boards | |
| parent | ASoC: rt711: add rt711 codec driver (diff) | |
| parent | ASoC: stm32: sai: fix possible circular locking (diff) | |
| download | linux-dev-23534b197159dd07d3e02d4afd7fca3243d30bce.tar.xz linux-dev-23534b197159dd07d3e02d4afd7fca3243d30bce.zip | |
Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.6
Diffstat (limited to 'sound/soc/intel/boards')
| -rw-r--r-- | sound/soc/intel/boards/bytcht_es8316.c | 3 | ||||
| -rw-r--r-- | sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 12a1c5255484..ce760c361eb2 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -445,7 +445,8 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "IRBIS"), DMI_MATCH(DMI_PRODUCT_NAME, "NB41"), }, - .driver_data = (void *)(BYT_CHT_ES8316_INTMIC_IN2_MAP + .driver_data = (void *)(BYT_CHT_ES8316_SSP0 + | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, { /* Teclast X98 Plus II */ diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index ab1196108d23..d6efc554898c 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -11,7 +11,6 @@ #include <linux/clk.h> #include <linux/dmi.h> #include <linux/slab.h> -#include <asm/cpu_device_id.h> #include <linux/acpi.h> #include <sound/core.h> #include <sound/jack.h> |