diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-29 18:05:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-29 18:05:09 +0200 |
| commit | 580c9d373ce7ccfbc5227e985fca761f8f039af3 (patch) | |
| tree | 4de132f09624dd2cafc51fcd3171e41494adef64 /sound/pci/ca0106/ca0106_main.c | |
| parent | e2cb0d95ba9fbd4603375032d37e9c0e288897b8 (diff) | |
| parent | 0d7392e54435476243ce08ba57745ab52d639cbb (diff) | |
| download | op-kernel-dev-580c9d373ce7ccfbc5227e985fca761f8f039af3.zip op-kernel-dev-580c9d373ce7ccfbc5227e985fca761f8f039af3.tar.gz | |
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/ca0106/ca0106_main.c')
| -rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 57b992a..f24bf1e 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -1876,7 +1876,7 @@ static int snd_ca0106_resume(struct pci_dev *pci) // PCI IDs static struct pci_device_id snd_ca0106_ids[] = { - { 0x1102, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Audigy LS or Live 24bit */ + { PCI_VDEVICE(CREATIVE, 0x0007), 0 }, /* Audigy LS or Live 24bit */ { 0, } }; MODULE_DEVICE_TABLE(pci, snd_ca0106_ids); |
