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/au88x0/au8820.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/au88x0/au8820.c')
-rw-r--r-- | sound/pci/au88x0/au8820.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/au88x0/au8820.c b/sound/pci/au88x0/au8820.c index d1fbcce..a652733 100644 --- a/sound/pci/au88x0/au8820.c +++ b/sound/pci/au88x0/au8820.c @@ -1,8 +1,7 @@ #include "au8820.h" #include "au88x0.h" static struct pci_device_id snd_vortex_ids[] = { - {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, + {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,}, {0,} }; |