Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 580c9d37 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/pci-vdevice' into for-linus 

* fix/pci-vdevice:
  sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
  sound: Use PCI_VDEVICE
parents e2cb0d95 0d7392e5

sound/oss/kahlua.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ MODULE_LICENSE("GPL"); 
 */

 */





static struct pci_device_id id_tbl[] = {

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 },

	{ }

	{ }

};

};

sound/pci/atiixp.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -287,10 +287,10 @@ struct atiixp { 
/*

/*

 */

 */

static struct pci_device_id snd_atiixp_ids[] = {

static struct pci_device_id snd_atiixp_ids[] = {

	{ 0x1002, 0x4341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */

	{ PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */

	{ 0x1002, 0x4361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB300 */

	{ PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */

	{ 0x1002, 0x4370, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB400 */

	{ PCI_VDEVICE(ATI, 0x4370), 0 }, /* SB400 */

	{ 0x1002, 0x4382, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB600 */

	{ PCI_VDEVICE(ATI, 0x4382), 0 }, /* SB600 */

	{ 0, }

	{ 0, }

};

};

sound/pci/atiixp_modem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -262,8 +262,8 @@ struct atiixp_modem { 
/*

/*

 */

 */

static struct pci_device_id snd_atiixp_ids[] = {

static struct pci_device_id snd_atiixp_ids[] = {

	{ 0x1002, 0x434d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */

	{ PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */

	{ 0x1002, 0x4378, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB400 */

	{ PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */

	{ 0, }

	{ 0, }

};

};

sound/pci/au88x0/au8810.c

+1 −2
Original line number Original line Diff line number Diff line 
#include "au8810.h"

#include "au8810.h"

#include "au88x0.h"

#include "au88x0.h"

static struct pci_device_id snd_vortex_ids[] = {

static struct pci_device_id snd_vortex_ids[] = {

	{PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE,

	{PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,},

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1,},

	{0,}

	{0,}

};

};

sound/pci/au88x0/au8820.c

+1 −2
Original line number Original line Diff line number Diff line 
#include "au8820.h"

#include "au8820.h"

#include "au88x0.h"

#include "au88x0.h"

static struct pci_device_id snd_vortex_ids[] = {

static struct pci_device_id snd_vortex_ids[] = {

	{PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1,

	{PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,},

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},

	{0,}

	{0,}

};

};