diff options
| author | Jakub Kicinski <[email protected]> | 2025-02-20 18:36:34 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-02-20 18:37:30 +0000 |
| commit | 5d6ba5ab8582aa35c1ee98e47af28e6f6772596c (patch) | |
| tree | a4a3a2d311773c19909c9928273e0bcae01a39ce /sound/hda/intel-dsp-config.c | |
| parent | Merge tag 'linux-can-next-for-6.15-20250219' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | Merge tag 'net-6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-5d6ba5ab8582aa35c1ee98e47af28e6f6772596c.tar.gz kernel-5d6ba5ab8582aa35c1ee98e47af28e6f6772596c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc4).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'sound/hda/intel-dsp-config.c')
| -rw-r--r-- | sound/hda/intel-dsp-config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index f564ec7af194..ce3ae2cba660 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -539,6 +539,11 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_PTL, }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = PCI_DEVICE_ID_INTEL_HDA_PTL_H, + }, + #endif }; |