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

Commit 0560551d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Fix wrong ID in via-agp.c
parents 1ca9bc4f bbdfff86

drivers/char/agp/via-agp.c

+3 −3
Original line number Diff line number Diff line
@@ -384,9 +384,9 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata = 
		.device_id	= PCI_DEVICE_ID_VIA_P4M800CE,

		.chipset_name	= "VT3314",

	},

	/* CX700 */

	/* VT3324 / CX700 */

	{

		.device_id  = PCI_DEVICE_ID_VIA_CX700,

		.device_id  = PCI_DEVICE_ID_VIA_VT3324,

		.chipset_name   = "CX700",

	},

	/* VT3336 */
@@ -540,7 +540,7 @@ static const struct pci_device_id agp_via_pci_table[] = { 
	ID(PCI_DEVICE_ID_VIA_83_87XX_1),

	ID(PCI_DEVICE_ID_VIA_3296_0),

	ID(PCI_DEVICE_ID_VIA_P4M800CE),

	ID(PCI_DEVICE_ID_VIA_CX700),

	ID(PCI_DEVICE_ID_VIA_VT3324),

	ID(PCI_DEVICE_ID_VIA_VT3336),

	ID(PCI_DEVICE_ID_VIA_P4M890),

	{ }

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,7 @@ 
#define PCI_DEVICE_ID_VIA_8363_0	0x0305

#define PCI_DEVICE_ID_VIA_P4M800CE	0x0314

#define PCI_DEVICE_ID_VIA_P4M890	0x0327

#define PCI_DEVICE_ID_VIA_VT3324	0x0324

#define PCI_DEVICE_ID_VIA_VT3336	0x0336

#define PCI_DEVICE_ID_VIA_8371_0	0x0391

#define PCI_DEVICE_ID_VIA_8501_0	0x0501