Changeset 598 for GPL/trunk/alsa-kernel/pci/cs5530.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (9 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/cs5530.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/pci/cs5530.c

@@ -40 +40 @@
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/sb.h>
@@ -59 +60 @@
 };
 
-static struct pci_device_id snd_cs5530_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs5530_ids) = {
         {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID,
                                                         PCI_ANY_ID, 0, 0},