diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-29 12:05:09 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-29 12:05:09 -0400 |
commit | 580c9d373ce7ccfbc5227e985fca761f8f039af3 (patch) | |
tree | 4de132f09624dd2cafc51fcd3171e41494adef64 /sound/pci/cs4281.c | |
parent | e2cb0d95ba9fbd4603375032d37e9c0e288897b8 (diff) | |
parent | 0d7392e54435476243ce08ba57745ab52d639cbb (diff) |
Merge branch 'fix/pci-vdevice' into for-linus
* fix/pci-vdevice:
sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
sound: Use PCI_VDEVICE
Diffstat (limited to 'sound/pci/cs4281.c')
-rw-r--r-- | sound/pci/cs4281.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index f6286f84a221..e2e0359bb056 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
@@ -495,7 +495,7 @@ struct cs4281 { | |||
495 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id); | 495 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id); |
496 | 496 | ||
497 | static struct pci_device_id snd_cs4281_ids[] = { | 497 | static struct pci_device_id snd_cs4281_ids[] = { |
498 | { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ | 498 | { PCI_VDEVICE(CIRRUS, 0x6005), 0, }, /* CS4281 */ |
499 | { 0, } | 499 | { 0, } |
500 | }; | 500 | }; |
501 | 501 | ||