Changeset 695 for GPL/trunk/alsa-kernel/include/sound/intel-dsp-config.h

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/intel-dsp-config.h (modified) (2 diffs)

GPL/trunk/alsa-kernel/include/sound/intel-dsp-config.h

@@ -22 +22 @@
 
 int snd_intel_dsp_driver_probe(struct pci_dev *pci);
+int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN]);
 
 #else
@@ -30 +31 @@
 }
 
+static inline
+int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN])
+{
+        return SND_INTEL_DSP_DRIVER_ANY;
+}
+
 #endif