regen

1 files changed, 190 insertions, 190 deletions

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index b604e75f974..5d5e7d82585 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1308 2008/01/02 09:31:26 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1309 2008/01/04 00:17:27 kettenis Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -5396,44 +5396,16 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82598EB CX4",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_DC100_HUB,
-	    "82815 Hub",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_HB,
+	    "82815 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_DC100_AGP,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_AGP,
 	    "82815 AGP",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_DC100_GRAPH,
-	    "82815 Graphics",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_NOAGP_HUB,
-	    "82815 Hub",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_NOAGP_GRAPH,
-	    "82815 Graphics",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_NOGRAPH_HUB,
-	    "82815 Hub",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_NOGRAPH_AGP,
-	    "82815 AGP",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_FULL_HUB,
-	    "82815 Hub",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_FULL_AGP,
-	    "82815 AGP",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_FULL_GRAPH,
-	    "82815 Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_IGD,
+	    "82815 Video",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82806AA_APIC,
@@ -5820,8 +5792,8 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82801ER SATA",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82820_MCH,
-	    "82820 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82820_HB,
+	    "82820 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82820_AGP,
@@ -5841,23 +5813,23 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82860_PCI1,
-	    "82860 PCI-PCI",
+	    "82860 PCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82860_PCI2,
-	    "82860 PCI-PCI",
+	    "82860 PCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82860_PCI3,
-	    "82860 PCI-PCI",
+	    "82860 PCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82860_PCI4,
-	    "82860 PCI-PCI",
+	    "82860 PCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_HB,
-	    "E7500 MCH Host",
+	    "E7500 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7500_DRAM,
@@ -5889,59 +5861,59 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7501_HB,
-	    "E7501 MCH Host",
+	    "E7501 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_HB,
-	    "E7505 MCH Host",
+	    "E7505 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_RAS,
-	    "E7505 MCH RAS",
+	    "E7505 RAS",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_AGP,
-	    "E7505 MCH AGP",
+	    "E7505 AGP",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_HI_B1,
-	    "E7505 MCH PCI-PCI",
+	    "E7505 PCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7505_HI_B2,
-	    "E7505 MCH PCI-PCI",
+	    "E7505 PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G,
-	    "82845G/GL",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_HB,
+	    "82845G Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_AGP,
-	    "82845G/GL/GV/GE/PE AGP",
+	    "82845G AGP",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82845G_IGD,
-	    "82845G/GL Video",
+	    "82845G Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_IO_1,
-	    "82865G/PE/P CPU-I/0-1",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_HB,
+	    "82865G Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_AGP,
-	    "82865G/PE/P CPU-AGP",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_AGP,
+	    "82865G AGP",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_IGD,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_IGD,
 	    "82865G Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_CSA,
-	    "82865G/PE/P CPU-CSA",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_CSA,
+	    "82865G CSA",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_IO_2,
-	    "82865G/PE/P CPU-I/0-2",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865G_OVF,
+	    "82865G Overflow",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82875P_HB,
@@ -5953,23 +5925,23 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82875P_CSA,
-	    "82875P PCI-CSA",
+	    "82875P CSA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_HB,
-	    "82915G/P/GV Host",
+	    "82915G Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_PCIE,
-	    "82915G/P/GV PCIE",
+	    "82915G PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IV,
-	    "82915G/P/GV Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IGD_1,
+	    "82915G Video",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82925X_HB,
-	    "82925X MCH Host",
+	    "82925X Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82925X_PCIE,
@@ -5977,7 +5949,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7221_HB,
-	    "E7221 MCH Host",
+	    "E7221 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7221_PCIE,
@@ -5989,15 +5961,15 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_HB,
-	    "82915GM/PM/GMS Host",
+	    "82915GM Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_PCIE,
-	    "82915PM/GM PCIE",
+	    "82915GM PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_IGD,
-	    "82915GM/GMS Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_IGD_1,
+	    "82915GM Video",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6300ESB_LPC,
@@ -6420,12 +6392,12 @@ static const struct pci_known_product pci_known_products[] = {
 	    "6321ESB IDE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GP_MCH,
-	    "82945GP",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_HB,
+	    "82945G Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GP_PCIE,
-	    "82945GP PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_PCIE,
+	    "82945G PCIE",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_IGD_1,
@@ -6433,7 +6405,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82955X_HB,
-	    "82955X MCH",
+	    "82955X Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82955X_PCIE,
@@ -6444,43 +6416,43 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82945G Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7230_MCH,
-	    "E7230 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7230_HB,
+	    "E7230 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7230_PCIE,
 	    "E7230 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82975X_MCH,
-	    "82975X MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82975X_HB,
+	    "82975X Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82975X_PCIE,
 	    "82975X PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IGD,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915G_IGD_2,
 	    "82915G Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_IGD_S,
-	    "82915GM/GMS Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_IGD_2,
+	    "82915GM Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_MCH,
-	    "82945GM MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_HB,
+	    "82945GM Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_PEG,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_PCIE,
 	    "82945GM PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_IGD,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_IGD_1,
 	    "82945GM Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_IGD_S,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_IGD_2,
 	    "82945GM Video",
 	},
 	{
@@ -6860,108 +6832,136 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82946GZ KT",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965G1_HB,
-	    "82965G1 Host",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_HB,
+	    "82G35 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965G1_PCIE,
-	    "82965G1 PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_PCIE,
+	    "82G35 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965G1_IGD,
-	    "82965G1 Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_IGD_1,
+	    "82G35 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_HB,
-	    "82Q963 Host",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_IGD_2,
+	    "82G35 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_PCIE,
-	    "82Q963 PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G35_HECI,
+	    "82G35 HECI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_IGD_1,
-	    "82Q963 Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_HB,
+	    "82Q965 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_IGD_2,
-	    "82Q963 Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_PCIE,
+	    "82Q965 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_HECI_1,
-	    "82Q963 HECI",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_IGD_1,
+	    "82Q965 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_HECI_2,
-	    "82Q963 HECI",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_IGD_2,
+	    "82Q965 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_PT_IDER,
-	    "82Q963 PT IDER",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_HECI_1,
+	    "82Q965 HECI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q963_KT,
-	    "82Q963 KT",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_HECI_2,
+	    "82Q965 HECI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_MCH,
-	    "82965 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_PT_IDER,
+	    "82Q965 PT IDER",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_PPB,
-	    "82965 PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_KT,
+	    "82Q965 KT",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_IGD_1,
-	    "82965 Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_HB,
+	    "82G965 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_IGD_2,
-	    "82965 Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_PCIE,
+	    "82G965 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_HECI_1,
-	    "82965 HECI",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_IGD_1,
+	    "82G965 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_HECI_2,
-	    "82965 HECI",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_IGD_2,
+	    "82G965 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_PT_IDER,
-	    "82965 PT IDER",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_HECI_1,
+	    "82G965 HECI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965_KT,
-	    "82965 KT",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_HECI_2,
+	    "82G965 HECI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_MCH,
-	    "82G33 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_PT_IDER,
+	    "82G965 PT IDER",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_KT,
+	    "82G965 KT",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_HB,
+	    "82G33 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_PCIE,
 	    "82G33 PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_IGD,
-	    "82G33 Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_IGD_1,
+	    "82G33 Video",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_IGD_2,
+	    "82G33 Video",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_HECI_1,
+	    "82G33 HECI",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_HECI_2,
+	    "82G33 HECI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GM_MCH,
-	    "82965GM MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_PT_IDER,
+	    "82G33 PT IDER",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GM_PCIE,
-	    "82965GM PCIE",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_KT,
+	    "82G33 KT",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GM_IGD_1,
-	    "82965GM Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_HB,
+	    "GM965 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GM_IGD_2,
-	    "82965GM Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_PCIE,
+	    "GM965 PCIE",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_IGD_1,
+	    "GM965 Video",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_IGD_2,
+	    "GM965 Video",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RCU32,
@@ -6976,12 +6976,16 @@ static const struct pci_known_product pci_known_products[] = {
 	    "31244 SATA",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855PE,
-	    "82855PE Hub",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855PM_HB,
+	    "82855PM Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855PE_AGP,
-	    "82855PE AGP",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855PM_AGP,
+	    "82855PM AGP",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855PM_PM,
+	    "82855PM Power",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6321ESB_PCIE_5,
@@ -7016,68 +7020,64 @@ static const struct pci_known_product pci_known_products[] = {
 	    "6321ESB PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_IO_1,
-	    "82830MP CPU-I/O-1",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_AGP,
-	    "82830MP CPU-AGP",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830M_HB,
+	    "82830M Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_IV,
-	    "82830MP Integrated Video",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830M_AGP,
+	    "82830M AGP",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_IO_2,
-	    "82830MP CPU-I/O-2",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830M_IGD,
+	    "82830M Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852GM_HPB,
-	    "82852GM Hub-PCI",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_HB,
+	    "82855GM Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852_AGP,
-	    "82852/82855 AGP",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GME_AGP,
+	    "82855GME AGP",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852GM_AGP,
-	    "82852GM AGP",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_IGD,
+	    "82855GM Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852GM_MEM,
-	    "82852GM Memory",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_MEM,
+	    "82855GM Memory",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852GM_CFG,
-	    "82852GM Configuration",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_CFG,
+	    "82855GM Config",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82854_MCH,
-	    "82854 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82854_HB,
+	    "82854 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82854_IGD,
 	    "82854 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_MCH,
-	    "E7520 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_HB,
+	    "E7520 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_MCH_ERR,
-	    "E7520 MCH ERR",
+	    "E7520 Error Reporting",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7320_MCH,
-	    "E7320 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7320_HB,
+	    "E7320 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_MCH_ERR,
-	    "E7525 MCH ERR",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_ERR,
+	    "E7525 Error Reporting",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_MCH_DMA,
-	    "E7520 MCH DMA",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7520_DMA,
+	    "E7520 DMA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MCH_PCIEA0,
@@ -7104,12 +7104,12 @@ static const struct pci_known_product pci_known_products[] = {
 	    "MCH PCIE",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_MCH_CFG,
-	    "E7525 MCH Configuration",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_CFG,
+	    "E7525 Config",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_MCH,
-	    "E7525 MCH",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7525_HB,
+	    "E7525 Host",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_WL_2200BG,
@@ -7188,28 +7188,28 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82371AB Power",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_MCH,
-	    "82810",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_HB,
+	    "82810 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_GC,
-	    "82810 Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_IGD,
+	    "82810 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_MCH,
-	    "82810-DC100",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_HB,
+	    "82810-DC100 Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_GC,
-	    "82810-DC100 Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_DC100_IGD,
+	    "82810-DC100 Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_MCH,
-	    "82810E",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_HB,
+	    "82810E Host",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_GC,
-	    "82810E Graphics",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810E_IGD,
+	    "82810E Video",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443LX,
@@ -7232,7 +7232,7 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82443BX",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX,
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX_HB,
 	    "82440MX Host",
 	},
 	{