sync

drivers/char/agp/amd-k8-agp.c

@@ -512,6 +512,7 @@ static struct __initdata pci_driver agp_amdk8_pci_driver = {
 	.probe		= agp_amdk8_probe,
 };
 
+/* Not static due to IOMMU code calling it early. */
 int __init agp_amdk8_init(void)
 {
 	int ret_val;

drivers/char/agp/via-agp.c

@@ -203,9 +203,9 @@ static struct agp_device_ids via_agp_device_ids[] __initdata =
 		.chipset_name	= "Apollo ProSavage PM133"
 	},
 	{
-		.device_id	= PCI_DEVICE_ID_VIA_8235_0,
-		.chipset	= VIA_P4X400,
-		.chipset_name	= "P4X400"
+		.device_id	= PCI_DEVICE_ID_VIA_8754,
+		.chipset	= VIA_P4X,
+		.chipset_name	= "Apollo P4X333/P4X400"
 	},
 	{ }, /* dummy final entry, always present */
 };

include/linux/agp_backend.h

@@ -63,7 +63,7 @@ enum chipset_type {
 	VIA_APOLLO_KT400_3,
 	VIA_APOLLO_PRO_266,
 	VIA_VT8605,
-	VIA_P4X400,
+	VIA_P4X,
 	SIS_GENERIC,
 	AMD_GENERIC,
 	AMD_IRONGATE,

include/linux/pci_ids.h

@@ -1092,7 +1092,7 @@
 #define PCI_DEVICE_ID_VIA_8233C_0	0x3109
 #define PCI_DEVICE_ID_VIA_8361		0x3112 
 #define PCI_DEVICE_ID_VIA_8233A		0x3147
-#define PCI_DEVICE_ID_VIA_8235_0	0x3168
+#define PCI_DEVICE_ID_VIA_8754		0x3168
 #define PCI_DEVICE_ID_VIA_8235		0x3177
 #define PCI_DEVICE_ID_VIA_8377_0	0x3189
 #define PCI_DEVICE_ID_VIA_86C100A	0x6100