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/oss/kahlua.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/oss/kahlua.c')
| -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 c180598..89466b0 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 }, { } }; |
