diff options
| author | Takashi Iwai | 2009-06-29 18:05:09 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2009-06-29 18:05:09 +0200 |
| commit | 580c9d373ce7ccfbc5227e985fca761f8f039af3 (patch) | |
| tree | 4de132f09624dd2cafc51fcd3171e41494adef64 /sound/oss | |
| parent | Merge branch 'fix/oxygen' into for-linus (diff) | |
| parent | sound: Use PCI_VDEVICE for CREATIVE and ECTIVA (diff) | |
| download | kernel-qcow2-linux-580c9d373ce7ccfbc5227e985fca761f8f039af3.tar.gz kernel-qcow2-linux-580c9d373ce7ccfbc5227e985fca761f8f039af3.tar.xz kernel-qcow2-linux-580c9d373ce7ccfbc5227e985fca761f8f039af3.zip | |
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/oss')
| -rw-r--r-- | sound/oss/kahlua.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c index c180598f1710..89466b056be7 100644 --- a/sound/oss/kahlua.c +++ b/sound/oss/kahlua.c @@ -199,7 +199,7 @@ MODULE_LICENSE("GPL"); */ static struct pci_device_id id_tbl[] = { - { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 }, { } }; |