mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
Here's a patch on top of the others to use CREATIVE and ECTIVA Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
28d27aae94
commit
0d7392e544
4 changed files with 6 additions and 6 deletions
|
@ -1876,7 +1876,7 @@ static int snd_ca0106_resume(struct pci_dev *pci)
|
||||||
|
|
||||||
// PCI IDs
|
// PCI IDs
|
||||||
static struct pci_device_id snd_ca0106_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, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
|
MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
|
||||||
|
|
|
@ -77,9 +77,9 @@ MODULE_PARM_DESC(subsystem, "Force card subsystem model.");
|
||||||
* Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400
|
* Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400
|
||||||
*/
|
*/
|
||||||
static struct pci_device_id snd_emu10k1_ids[] = {
|
static struct pci_device_id snd_emu10k1_ids[] = {
|
||||||
{ 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* EMU10K1 */
|
{ PCI_VDEVICE(CREATIVE, 0x0002), 0 }, /* EMU10K1 */
|
||||||
{ 0x1102, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, /* Audigy */
|
{ PCI_VDEVICE(CREATIVE, 0x0004), 1 }, /* Audigy */
|
||||||
{ 0x1102, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, /* Audigy 2 Value SB0400 */
|
{ PCI_VDEVICE(CREATIVE, 0x0008), 1 }, /* Audigy 2 Value SB0400 */
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1607,7 +1607,7 @@ static void __devexit snd_emu10k1x_remove(struct pci_dev *pci)
|
||||||
|
|
||||||
// PCI IDs
|
// PCI IDs
|
||||||
static struct pci_device_id snd_emu10k1x_ids[] = {
|
static struct pci_device_id snd_emu10k1x_ids[] = {
|
||||||
{ 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Dell OEM version (EMU10K1) */
|
{ PCI_VDEVICE(CREATIVE, 0x0006), 0 }, /* Dell OEM version (EMU10K1) */
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
|
MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
|
||||||
|
|
|
@ -450,7 +450,7 @@ static struct pci_device_id snd_audiopci_ids[] = {
|
||||||
#ifdef CHIP1371
|
#ifdef CHIP1371
|
||||||
{ PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
|
{ PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
|
||||||
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
|
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
|
||||||
{ 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
|
{ PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
|
||||||
#endif
|
#endif
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue