Merge mainline (v2.6.34-rc7)

[~andy/linux] / sound / pci / cs4281.c

diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index e2e0359bb0568ca98999f2512baeb83e67a55883..9edc65059e3e4e02fe76ed6526613591c213b089 100644 (file)
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -494,7 +494,7 @@ struct cs4281 {
 
 static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
 
-static struct pci_device_id snd_cs4281_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs4281_ids) = {
        { PCI_VDEVICE(CIRRUS, 0x6005), 0, },    /* CS4281 */
        { 0, }
 };