diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-02-10 19:23:02 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-10 19:23:02 +0000 |
| commit | 6719f657e420600443f1a78dcd987c82ece1f473 (patch) | |
| tree | bcd660428abf58a8bc407cfe1d04eb0e92697f67 /sound/soc/intel/common/sst-acpi.c | |
| parent | Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus (diff) | |
| parent | ASoC: Intel: Add module tags for common match module (diff) | |
| download | linux-dev-6719f657e420600443f1a78dcd987c82ece1f473.tar.xz linux-dev-6719f657e420600443f1a78dcd987c82ece1f473.zip | |
Merge remote-tracking branch 'asoc/fix/intel-kconfig' into asoc-linus
Diffstat (limited to 'sound/soc/intel/common/sst-acpi.c')
| -rw-r--r-- | sound/soc/intel/common/sst-acpi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c index 7a85c576dad3..2c5eda14d510 100644 --- a/sound/soc/intel/common/sst-acpi.c +++ b/sound/soc/intel/common/sst-acpi.c @@ -215,6 +215,7 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { .dma_size = SST_LPT_DSP_DMA_SIZE, }; +#if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI) static struct sst_acpi_mach baytrail_machines[] = { { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, @@ -231,11 +232,14 @@ static struct sst_acpi_desc sst_acpi_baytrail_desc = { .sst_id = SST_DEV_ID_BYT, .resindex_dma_base = -1, }; +#endif static const struct acpi_device_id sst_acpi_match[] = { { "INT33C8", (unsigned long)&sst_acpi_haswell_desc }, { "INT3438", (unsigned long)&sst_acpi_broadwell_desc }, +#if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI) { "80860F28", (unsigned long)&sst_acpi_baytrail_desc }, +#endif { } }; MODULE_DEVICE_TABLE(acpi, sst_acpi_match); |