diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-29 20:47:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-29 20:47:01 +0100 |
| commit | 351cf7445f009d7c4edcecdaf7cdee8f33046164 (patch) | |
| tree | 792e5215550df8566db077ffdb26fae97db9e863 /sound/hda | |
| parent | f10b6c99c08433861d1ed62267fa57ced7dbdf50 (diff) | |
| parent | 3f31f7d9b5404a10648abe536c8b408bfb4502e1 (diff) | |
Merge branch 'for-5.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.9
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/intel-dsp-config.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 20b8f6cb3ff8..99aec7349167 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -208,8 +208,8 @@ static const struct config_entry config_table[] = { }, #endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE) /* Cometlake-LP */ -#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) { .flags = FLAG_SOF, .device = 0x02c8, @@ -240,9 +240,7 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x02c8, }, -#endif /* Cometlake-H */ -#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) { .flags = FLAG_SOF, .device = 0x06c8, |