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/ens1370.c | |
| parent | e2cb0d95ba9fbd4603375032d37e9c0e288897b8 (diff) | |
| parent | 0d7392e54435476243ce08ba57745ab52d639cbb (diff) | |
| download | kernel_samsung_smdk4412-580c9d373ce7ccfbc5227e985fca761f8f039af3.tar.gz kernel_samsung_smdk4412-580c9d373ce7ccfbc5227e985fca761f8f039af3.tar.bz2 kernel_samsung_smdk4412-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/pci/ens1370.c')
| -rw-r--r-- | sound/pci/ens1370.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 18f4d1e98c4..2b82c5c723e 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -445,12 +445,12 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id); static struct pci_device_id snd_audiopci_ids[] = { #ifdef CHIP1370 - { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */ + { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */ #endif #ifdef CHIP1371 - { 0x1274, 0x1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1371 */ - { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */ - { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */ + { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */ + { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ + { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ #endif { 0, } }; |