Merge tag 'md/3.18' of git://neil.brown.name/md

[deliverable/linux.git] / sound / pci / es1968.c

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 5bb1cf603301e28ef937f7b4416a93dd5008e916..a9956a7c567708a45a1819fe4092108a2361778b 100644 (file)
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -570,7 +570,7 @@ struct es1968 {
 
 static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id);
 
-static DEFINE_PCI_DEVICE_TABLE(snd_es1968_ids) = {
+static const struct pci_device_id snd_es1968_ids[] = {
        /* Maestro 1 */
         { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO },
        /* Maestro 2 */