src - OpenBSD base system

diff options


context:
space:
mode:

author	Theo de Raadt <deraadt@cvs.openbsd.org>	2003-12-15 00:41:02 +0000
committer	Theo de Raadt <deraadt@cvs.openbsd.org>	2003-12-15 00:41:02 +0000
commit	19a2e68127230b35c8465105d66464be87098dfc (patch)
tree	9cc94b80284e8d07754370509df960810d621573 /sys
parent	9eec65aa0417a329eeb3e4e9d4378c68ca8b52ea (diff)

sync

Diffstat (limited to 'sys')

-rw-r--r--

sys/dev/pci/pcidevs.h

362

-rw-r--r--

sys/dev/pci/pcidevs_data.h

362

2 files changed, 362 insertions, 362 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 84648848459..629977d61d7 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h

@@ -2,7 +2,7 @@

* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.

* generated from:

- * OpenBSD: pcidevs,v 1.696 2003/12/12 22:56:59 deraadt Exp

+ * OpenBSD: pcidevs,v 1.697 2003/12/15 00:40:56 deraadt Exp

/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */

@@ -59,7 +59,7 @@

#define PCI_VENDOR_SYMBIOS 0x1000 /* Symbios Logic */

#define PCI_VENDOR_ATI 0x1002 /* ATI */

#define PCI_VENDOR_ULSI 0x1003 /* ULSI Systems */

-#define PCI_VENDOR_VLSI 0x1004 /* VLSI Technology */

+#define PCI_VENDOR_VLSI 0x1004 /* VLSI */

#define PCI_VENDOR_AVANCE 0x1005 /* Avance Logic */

#define PCI_VENDOR_NS 0x100b /* NS */

#define PCI_VENDOR_TSENG 0x100c /* Tseng Labs */

@@ -82,7 +82,7 @@

#define PCI_VENDOR_SIS 0x1039 /* SIS */

#define PCI_VENDOR_HP 0x103c /* Hewlett-Packard */

#define PCI_VENDOR_PCTECH 0x1042 /* PC Technology */

-#define PCI_VENDOR_ASUSTEK 0x1043 /* Asustek Computer */

+#define PCI_VENDOR_ASUSTEK 0x1043 /* Asustek */

#define PCI_VENDOR_DPT 0x1044 /* DPT */

#define PCI_VENDOR_OPTI 0x1045 /* Opti */

#define PCI_VENDOR_ELSA 0x1048 /* Elsa */

@@ -97,7 +97,7 @@

#define PCI_VENDOR_NUMBER9 0x105d /* Number 9 */

#define PCI_VENDOR_UMC 0x1060 /* UMC */

#define PCI_VENDOR_ITT 0x1061 /* I. T. T. */

-#define PCI_VENDOR_PICOPOWER 0x1066 /* Picopower Technology */

+#define PCI_VENDOR_PICOPOWER 0x1066 /* Picopower */

#define PCI_VENDOR_MYLEX 0x1069 /* Mylex */

#define PCI_VENDOR_APPLE 0x106b /* Apple */

#define PCI_VENDOR_YAMAHA 0x1073 /* Yamaha */

@@ -107,7 +107,7 @@

#define PCI_VENDOR_LEADTEK 0x107d /* LeadTek Research */

#define PCI_VENDOR_INTERPHASE 0x107e /* Interphase */

#define PCI_VENDOR_CONTAQ 0x1080 /* Contaq Microsystems */

-#define PCI_VENDOR_BIT3 0x108a /* Bit3 Computer Corp. */

+#define PCI_VENDOR_BIT3 0x108a /* Bit3 */

#define PCI_VENDOR_OLICOM 0x108d /* Olicom */

#define PCI_VENDOR_SUN 0x108e /* Sun */

#define PCI_VENDOR_INTERGRAPH 0x1091 /* Intergraph */

@@ -119,13 +119,13 @@

#define PCI_VENDOR_ACC 0x10aa /* ACC Microelectronics */

#define PCI_VENDOR_SYMPHONY 0x10ad /* Symphony Labs */

#define PCI_VENDOR_STB 0x10b4 /* STB Systems */

-#define PCI_VENDOR_PLX 0x10b5 /* PLX Technology */

+#define PCI_VENDOR_PLX 0x10b5 /* PLX */

#define PCI_VENDOR_MADGE 0x10b6 /* Madge Networks */

#define PCI_VENDOR_3COM 0x10b7 /* 3Com */

#define PCI_VENDOR_SMC 0x10b8 /* SMC */

#define PCI_VENDOR_ALI 0x10b9 /* Acer Labs */

#define PCI_VENDOR_MITSUBISHIELEC 0x10ba /* Mitsubishi Electronics */

-#define PCI_VENDOR_SURECOM 0x10bd /* Surecom Technology */

+#define PCI_VENDOR_SURECOM 0x10bd /* Surecom */

#define PCI_VENDOR_NEOMAGIC 0x10c8 /* Neomagic */

#define PCI_VENDOR_MENTOR 0x10cc /* Mentor ARC */

#define PCI_VENDOR_ADVSYS 0x10cd /* Advansys */

@@ -135,7 +135,7 @@

#define PCI_VENDOR_NVIDIA 0x10de /* Nvidia */

#define PCI_VENDOR_EMULEX 0x10df /* Emulex */

#define PCI_VENDOR_IMS 0x10e0 /* Integrated Micro Solutions */

-#define PCI_VENDOR_TEKRAM 0x10e1 /* Tekram Technology (1st ID) */

+#define PCI_VENDOR_TEKRAM 0x10e1 /* Tekram (1st ID) */

#define PCI_VENDOR_NEWBRIDGE 0x10e3 /* Newbridge */

#define PCI_VENDOR_AMCIRCUITS 0x10e8 /* Applied Micro Circuits */

#define PCI_VENDOR_REALTEK 0x10ec /* Realtek */

@@ -147,7 +147,7 @@

#define PCI_VENDOR_VIATECH 0x1106 /* VIA */

#define PCI_VENDOR_COGENT 0x1109 /* Cogent Data Technologies */

#define PCI_VENDOR_SIEMENS 0x110a /* Siemens AG / Siemens Nixdorf AG */

-#define PCI_VENDOR_ACCTON 0x1113 /* Accton Technology */

+#define PCI_VENDOR_ACCTON 0x1113 /* Accton */

#define PCI_VENDOR_VORTEX 0x1119 /* Vortex */

#define PCI_VENDOR_EFFICIENTNETS 0x111a /* Efficent Networks */

#define PCI_VENDOR_IDT 0x111d /* IDT */

@@ -218,7 +218,7 @@

#define PCI_VENDOR_SUNIX 0x1409 /* Sunix */

#define PCI_VENDOR_OXFORD2 0x1415 /* Oxford */

#define PCI_VENDOR_TAMARACK 0x143d /* Tamarack Microelectronics */

-#define PCI_VENDOR_ASKEY 0x144f /* Askey Computer Corp. */

+#define PCI_VENDOR_ASKEY 0x144f /* Askey */

#define PCI_VENDOR_AVERMEDIA 0x1461 /* Avermedia Technologies */

#define PCI_VENDOR_OXFORD 0x14d2 /* Oxford */

#define PCI_VENDOR_AIRONET 0x14b9 /* Aironet */

@@ -228,7 +228,7 @@

#define PCI_VENDOR_DELTA 0x1500 /* Delta */

#define PCI_VENDOR_MYSON 0x1516 /* Myson Century */

#define PCI_VENDOR_TOPIC 0x151f /* Topic/SmartLink */

-#define PCI_VENDOR_ENE 0x1524 /* ENE Technology */

+#define PCI_VENDOR_ENE 0x1524 /* ENE */

#define PCI_VENDOR_TERRATEC 0x153b /* TerraTec Electronic Gmbh */

#define PCI_VENDOR_SYMBOL 0x1562 /* Symbol */

#define PCI_VENDOR_SYBA 0x1592 /* Syba */

@@ -246,7 +246,7 @@

#define PCI_VENDOR_CAVIUM 0x177d /* Cavium */

#define PCI_VENDOR_LANERGY 0x1812 /* Lanergy */

#define PCI_VENDOR_SYMPHONY2 0x1c1c /* Symphony Labs */

-#define PCI_VENDOR_TEKRAM2 0x1de1 /* Tekram Technology */

+#define PCI_VENDOR_TEKRAM2 0x1de1 /* Tekram */

#define PCI_VENDOR_HINT 0x3388 /* Hint */

#define PCI_VENDOR_3DLABS 0x3d3d /* 3D Labs */

#define PCI_VENDOR_AVANCE2 0x4005 /* Avance Logic */

@@ -273,12 +273,12 @@

/* O2 Micro */

-#define PCI_PRODUCT_O2MICRO_OZ6832 0x6832 /* OZ6832 and OZ6836 CardBus */

-#define PCI_PRODUCT_O2MICRO_OZ6836 0x6836 /* OZ6836 and OZ6860 CardBus */

-#define PCI_PRODUCT_O2MICRO_OZ6872 0x6872 /* OZ6812 and OZ6872 CardBus */

+#define PCI_PRODUCT_O2MICRO_OZ6832 0x6832 /* OZ6832 CardBus */

+#define PCI_PRODUCT_O2MICRO_OZ6836 0x6836 /* OZ6836/OZ6860 CardBus */

+#define PCI_PRODUCT_O2MICRO_OZ6872 0x6872 /* OZ68[17]2 CardBus */

#define PCI_PRODUCT_O2MICRO_OZ6922 0x6925 /* OZ6922 CardBus */

#define PCI_PRODUCT_O2MICRO_OZ6933 0x6933 /* OZ6933 CardBus */

-#define PCI_PRODUCT_O2MICRO_OZ6972 0x6972 /* OZ6912 and OZ6972 CardBus */

+#define PCI_PRODUCT_O2MICRO_OZ6972 0x6972 /* OZ69[17]2 CardBus */

/* 3Com Products */

#define PCI_PRODUCT_3COM_3C985 0x0001 /* 3c985 */

@@ -347,8 +347,8 @@

#define PCI_PRODUCT_TRIWARE_ESCALADE_ASIC 0x1001 /* Escalade IDE RAID */

/* Aironet Products */

-#define PCI_PRODUCT_AIRONET_PC4800_1 0x0001 /* Cisco PC4800 Wireless */

-#define PCI_PRODUCT_AIRONET_PCI352 0x0350 /* Cisco/Aironet PCI35x WLAN */

+#define PCI_PRODUCT_AIRONET_PC4800_1 0x0001 /* PC4800 Wireless */

+#define PCI_PRODUCT_AIRONET_PCI352 0x0350 /* PCI35x WLAN */

#define PCI_PRODUCT_AIRONET_PC4500 0x4500 /* PC4500 Wireless */

#define PCI_PRODUCT_AIRONET_PC4800 0x4800 /* PC4800 Wireless */

#define PCI_PRODUCT_AIRONET_MPI350 0xa504 /* MPI-350 Wireless */

@@ -359,17 +359,17 @@

#define PCI_PRODUCT_ACC_2051_ISA 0x5842 /* 2051 Host-ISA */

/* Acard products */

-#define PCI_PRODUCT_ACARD_ATP850U 0x0005 /* ATP850U/UF IDE */

-#define PCI_PRODUCT_ACARD_ATP860 0x0006 /* ATP860 IDE */

-#define PCI_PRODUCT_ACARD_ATP860A 0x0007 /* ATP860-A IDE */

-#define PCI_PRODUCT_ACARD_ATP865A 0x0008 /* ATP865-A IDE */

-#define PCI_PRODUCT_ACARD_ATP865R 0x0009 /* ATP865-R IDE */

-#define PCI_PRODUCT_ACARD_AEC6710 0x8002 /* AEC6710 SCSI */

-#define PCI_PRODUCT_ACARD_AEC6712UW 0x8010 /* AEC6712UW SCSI */

-#define PCI_PRODUCT_ACARD_AEC6712U 0x8020 /* AEC6712U SCSI */

-#define PCI_PRODUCT_ACARD_AEC6712S 0x8030 /* AEC6712S SCSI */

-#define PCI_PRODUCT_ACARD_AEC6710D 0x8040 /* AEC6710D SCSI */

-#define PCI_PRODUCT_ACARD_AEC6715UW 0x8050 /* AEC6715UW SCSI */

+#define PCI_PRODUCT_ACARD_ATP850U 0x0005 /* ATP850U/UF */

+#define PCI_PRODUCT_ACARD_ATP860 0x0006 /* ATP860 */

+#define PCI_PRODUCT_ACARD_ATP860A 0x0007 /* ATP860-A */

+#define PCI_PRODUCT_ACARD_ATP865A 0x0008 /* ATP865-A */

+#define PCI_PRODUCT_ACARD_ATP865R 0x0009 /* ATP865-R */

+#define PCI_PRODUCT_ACARD_AEC6710 0x8002 /* AEC6710 */

+#define PCI_PRODUCT_ACARD_AEC6712UW 0x8010 /* AEC6712UW */

+#define PCI_PRODUCT_ACARD_AEC6712U 0x8020 /* AEC6712U */

+#define PCI_PRODUCT_ACARD_AEC6712S 0x8030 /* AEC6712S */

+#define PCI_PRODUCT_ACARD_AEC6710D 0x8040 /* AEC6710D */

+#define PCI_PRODUCT_ACARD_AEC6715UW 0x8050 /* AEC6715UW */

/* Accton products */

#define PCI_PRODUCT_ACCTON_5030 0x1211 /* MPX 5030/5038 */

@@ -385,16 +385,16 @@

/* Acer Labs products */

#define PCI_PRODUCT_ALI_M1445 0x1445 /* M1445 VL-PCI */

-#define PCI_PRODUCT_ALI_M1449 0x1449 /* M1449 PCI-ISA */

+#define PCI_PRODUCT_ALI_M1449 0x1449 /* M1449 ISA */

#define PCI_PRODUCT_ALI_M1451 0x1451 /* M1451 Host-PCI */

#define PCI_PRODUCT_ALI_M1461 0x1461 /* M1461 Host-PCI */

#define PCI_PRODUCT_ALI_M1489 0x1489 /* M1489 Host-PCI */

#define PCI_PRODUCT_ALI_M1521 0x1521 /* M1523 Host-PCI */

-#define PCI_PRODUCT_ALI_M1523 0x1523 /* M1523 PCI-ISA */

+#define PCI_PRODUCT_ALI_M1523 0x1523 /* M1523 ISA */

#define PCI_PRODUCT_ALI_M1531 0x1531 /* M1531 Host-PCI */

-#define PCI_PRODUCT_ALI_M1533 0x1533 /* M1533 PCI-ISA */

+#define PCI_PRODUCT_ALI_M1533 0x1533 /* M1533 ISA */

#define PCI_PRODUCT_ALI_M1535 0x1535 /* M1535 PCI */

-#define PCI_PRODUCT_ALI_M1543 0x1543 /* M1543 PCI-ISA */

+#define PCI_PRODUCT_ALI_M1543 0x1543 /* M1543 ISA */

#define PCI_PRODUCT_ALI_M1541 0x1541 /* M1541 Host-PCI */

#define PCI_PRODUCT_ALI_M1621 0x1621 /* M1621 Host-PCI */

#define PCI_PRODUCT_ALI_M1647 0x1647 /* M1647 PCI */

@@ -494,34 +494,34 @@

#define PCI_PRODUCT_AMD_AMD64_ADDR 0x1101 /* AMD64 Address Map */

#define PCI_PRODUCT_AMD_AMD64_DRAM 0x1102 /* AMD64 DRAM Cfg */

#define PCI_PRODUCT_AMD_AMD64_MISC 0x1103 /* AMD64 Misc Cfg */

-#define PCI_PRODUCT_AMD_PCNET_PCI 0x2000 /* 79c970 PCnet-PCI LANCE */

-#define PCI_PRODUCT_AMD_PCHOME_PCI 0x2001 /* 79c978 PChome-PCI LANCE */

-#define PCI_PRODUCT_AMD_PCSCSI_PCI 0x2020 /* 53c974 PCscsi-PCI SCSI */

-#define PCI_PRODUCT_AMD_PCNETS_PCI 0x2040 /* 79C974 PCnet-PCI Ether+SCSI */

+#define PCI_PRODUCT_AMD_PCNET_PCI 0x2000 /* 79c970 PCnet-PCI */

+#define PCI_PRODUCT_AMD_PCHOME_PCI 0x2001 /* 79c978 PChome-PCI */

+#define PCI_PRODUCT_AMD_PCSCSI_PCI 0x2020 /* 53c974 PCscsi-PCI */

+#define PCI_PRODUCT_AMD_PCNETS_PCI 0x2040 /* 79C974 PCnet-PCI */

#define PCI_PRODUCT_AMD_ELANSC520 0x3000 /* ElanSC520 Host-PCI */

/* http://www.amd.com/products/cpg/athlon/techdocs/pdf/21910.pdf */

-#define PCI_PRODUCT_AMD_SC751_SC 0x7006 /* 751 System Controller */

+#define PCI_PRODUCT_AMD_SC751_SC 0x7006 /* 751 System */

#define PCI_PRODUCT_AMD_SC751_PPB 0x7007 /* 751 PCI-PCI */

/* http://www.amd.com/products/cpg/athlon/techdocs/pdf/24462.pdf */

#define PCI_PRODUCT_AMD_762_PCHB 0x700c /* 762 Host-PCI */

#define PCI_PRODUCT_AMD_762_PPB 0x700d /* 762 PCI-PCI */

#define PCI_PRODUCT_AMD_761_PCHB 0x700e /* 761 Host-PCI */

#define PCI_PRODUCT_AMD_761_PPB 0x700f /* 761 PCI-PCI */

-#define PCI_PRODUCT_AMD_755_ISA 0x7400 /* 755 PCI-ISA */

+#define PCI_PRODUCT_AMD_755_ISA 0x7400 /* 755 ISA */

#define PCI_PRODUCT_AMD_755_IDE 0x7401 /* 755 IDE */

#define PCI_PRODUCT_AMD_755_PMC 0x7403 /* 755 Power Mgmt */

#define PCI_PRODUCT_AMD_755_USB 0x7404 /* 755 USB */

/* http://www.amd.com/products/cpg/athlon/techdocs/pdf/22548.pdf */

-#define PCI_PRODUCT_AMD_PBC756_ISA 0x7408 /* 756 PCI-ISA */

+#define PCI_PRODUCT_AMD_PBC756_ISA 0x7408 /* 756 ISA */

#define PCI_PRODUCT_AMD_PBC756_IDE 0x7409 /* 756 IDE */

#define PCI_PRODUCT_AMD_PBC756_PMC 0x740b /* 756 Power Mgmt */

#define PCI_PRODUCT_AMD_PBC756_USB 0x740c /* 756 USB Host */

-#define PCI_PRODUCT_AMD_766_ISA 0x7410 /* 766 PCI-ISA */

+#define PCI_PRODUCT_AMD_766_ISA 0x7410 /* 766 ISA */

#define PCI_PRODUCT_AMD_766_IDE 0x7411 /* 766 IDE */

#define PCI_PRODUCT_AMD_766_USB 0x7412 /* 766 USB */

#define PCI_PRODUCT_AMD_766_PMC 0x7413 /* 766 Power Mgmt */

#define PCI_PRODUCT_AMD_766_USB_HCI 0x7414 /* 766 USB OpenHCI */

-#define PCI_PRODUCT_AMD_PBC768_ISA 0x7440 /* 768 PCI-ISA */

+#define PCI_PRODUCT_AMD_PBC768_ISA 0x7440 /* 768 ISA */

#define PCI_PRODUCT_AMD_PBC768_IDE 0x7441 /* 768 IDE */

#define PCI_PRODUCT_AMD_PBC768_PMC 0x7443 /* 768 Power Mgmt */

#define PCI_PRODUCT_AMD_PBC768_ACA 0x7445 /* 768 AC97 Audio */

@@ -571,9 +571,9 @@

#define PCI_PRODUCT_APPLE_UNINORTH_FW 0x0031 /* UniNorth Firewire */

#define PCI_PRODUCT_APPLE_GMAC3 0x0032 /* GMAC Ethernet */

#define PCI_PRODUCT_APPLE_UNINORTH_ATA 0x0033 /* Uni-N ATA */

-#define PCI_PRODUCT_APPLE_UNINORTH_AGP3 0x0034 /* UniNorth AGP Bridge */

-#define PCI_PRODUCT_APPLE_UNINORTH5 0x0035 /* UniNorth Host-PCI Bridge */

-#define PCI_PRODUCT_APPLE_UNINORTH6 0x0036 /* UniNorth Host-PCI Bridge */

+#define PCI_PRODUCT_APPLE_UNINORTH_AGP3 0x0034 /* UniNorth AGP */

+#define PCI_PRODUCT_APPLE_UNINORTH5 0x0035 /* UniNorth Host-PCI */

+#define PCI_PRODUCT_APPLE_UNINORTH6 0x0036 /* UniNorth Host-PCI */

#define PCI_PRODUCT_APPLE_INTREPID_ATA 0x003b /* Intrepid ATA */

#define PCI_PRODUCT_APPLE_INTREPID 0x003e /* Intrepid */

#define PCI_PRODUCT_APPLE_INTREPID_OHCI 0x003f /* Intrepid USB */

@@ -696,8 +696,8 @@

#define PCI_PRODUCT_AVM_T1 0x1200 /* PRI T1 ISDN */

/* Bit3 products */

-#define PCI_PRODUCT_BIT3_PCIVME617 0x0001 /* PCI-VME 617 */

-#define PCI_PRODUCT_BIT3_PCIVME2706 0x0300 /* PCI-VME 2706 */

+#define PCI_PRODUCT_BIT3_PCIVME617 0x0001 /* VME 617 */

+#define PCI_PRODUCT_BIT3_PCIVME2706 0x0300 /* VME 2706 */

/* Bluesteel Networks */

#define PCI_PRODUCT_BLUESTEEL_5501 0x0000 /* 5501 */

@@ -735,7 +735,7 @@

#define PCI_PRODUCT_BROOKTREE_BT879 0x036f /* BT879 */

#define PCI_PRODUCT_BROOKTREE_BT878_AU 0x0878 /* BT878 Audio */

#define PCI_PRODUCT_BROOKTREE_BT879_AU 0x0879 /* BT879 Audio */

-#define PCI_PRODUCT_BROOKTREE_BT8474 0x8474 /* Bt8474 Multichannel HDLC Controller */

+#define PCI_PRODUCT_BROOKTREE_BT8474 0x8474 /* Bt8474 HDLC */

/* BusLogic products */

#define PCI_PRODUCT_BUSLOGIC_MULTIMASTER_NC 0x0140 /* MultiMaster NC */

@@ -774,8 +774,8 @@

#define PCI_PRODUCT_CIRRUS_CL_GD5464 0x00d4 /* CL-GD5464 */

#define PCI_PRODUCT_CIRRUS_CL_GD5465 0x00d6 /* CL-GD5465 */

#define PCI_PRODUCT_CIRRUS_CL_PD6729 0x1100 /* CL-PD6729 */

-#define PCI_PRODUCT_CIRRUS_CL_PD6832 0x1110 /* CL-PD6832 PCI-CardBus */

-#define PCI_PRODUCT_CIRRUS_CL_PD6833 0x1113 /* CL-PD6833 PCI-CardBus */

+#define PCI_PRODUCT_CIRRUS_CL_PD6832 0x1110 /* CL-PD6832 CardBus */

+#define PCI_PRODUCT_CIRRUS_CL_PD6833 0x1113 /* CL-PD6833 CardBus */

#define PCI_PRODUCT_CIRRUS_CL_GD7542 0x1200 /* CL-GD7542 */

#define PCI_PRODUCT_CIRRUS_CL_GD7543 0x1202 /* CL-GD7543 */

#define PCI_PRODUCT_CIRRUS_CL_GD7541 0x1204 /* CL-GD7541 */

@@ -805,8 +805,8 @@

#define PCI_PRODUCT_COGENT_EM110TX 0x1400 /* EX110TX */

/* Compaq products */

-#define PCI_PRODUCT_COMPAQ_PCI_EISA_BRIDGE 0x0001 /* PCI-EISA */

-#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE 0x0002 /* PCI-ISA */

+#define PCI_PRODUCT_COMPAQ_PCI_EISA_BRIDGE 0x0001 /* EISA */

+#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE 0x0002 /* ISA */

#define PCI_PRODUCT_COMPAQ_TRIFLEX1 0x1000 /* Triflex Host-PCI */

#define PCI_PRODUCT_COMPAQ_TRIFLEX2 0x2000 /* Triflex Host-PCI */

#define PCI_PRODUCT_COMPAQ_QVISION_V0 0x3032 /* QVision */

@@ -823,19 +823,19 @@

#define PCI_PRODUCT_COMPAQ_CSA6400EM 0x409D /* Smart Array 6400 EM */

#define PCI_PRODUCT_COMPAQ_USB 0x7020 /* USB */

#define PCI_PRODUCT_COMPAQ_FXP 0xa0f0 /* Netelligent ASMC */

-#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE1 0xa0f3 /* PCI-ISA */

-#define PCI_PRODUCT_COMPAQ_PCI_HOTPLUG 0xa0f7 /* PCI Hotplug controller */

+#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE1 0xa0f3 /* ISA */

+#define PCI_PRODUCT_COMPAQ_PCI_HOTPLUG 0xa0f7 /* PCI Hotplug */

#define PCI_PRODUCT_COMPAQ_OHCI 0xa0f8 /* USB OpenHost */

#define PCI_PRODUCT_COMPAQ_SMART2P 0xae10 /* SMART2P RAID */

-#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE3 0xae29 /* PCI-ISA */

-#define PCI_PRODUCT_COMPAQ_PCI_ISAPNP 0xae2b /* PCI-ISAPnP */

+#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE3 0xae29 /* ISA */

+#define PCI_PRODUCT_COMPAQ_PCI_ISAPNP 0xae2b /* ISAPnP */

#define PCI_PRODUCT_COMPAQ_N100TX 0xae32 /* Netelligent 10/100 TX */

#define PCI_PRODUCT_COMPAQ_IDE 0xae33 /* Netelligent IDE */

#define PCI_PRODUCT_COMPAQ_N10T 0xae34 /* Netelligent 10 T */

#define PCI_PRODUCT_COMPAQ_IntNF3P 0xae35 /* Integrated NetFlex 3/P */

#define PCI_PRODUCT_COMPAQ_DPNet100TX 0xae40 /* Dual Port Netelligent 10/100 TX */

#define PCI_PRODUCT_COMPAQ_IntPL100TX 0xae43 /* ProLiant Netelligent 10/100 TX */

-#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE2 0xae69 /* PCI-ISA */

+#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE2 0xae69 /* ISA */

#define PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE1 0xae6c /* Host-PCI */

#define PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE2 0xae6d /* Host-PCI */

#define PCI_PRODUCT_COMPAQ_DP4000 0xb011 /* Embedded Netelligent 10/100 TX */

@@ -854,14 +854,14 @@

/* Conexant products */

#define PCI_PRODUCT_CONEXANT_56K_WINMODEM 0x1033 /* 56k Winmodem */

#define PCI_PRODUCT_CONEXANT_56K_WINMODEM2 0x1036 /* 56k Winmodem */

-#define PCI_PRODUCT_CONEXANT_RS7112 0x1803 /* 10/100 MiniPCI Ethernet */

-#define PCI_PRODUCT_CONEXANT_56K_WINMODEM3 0x1804 /* 10/100 MiniPCI Ethernet */

+#define PCI_PRODUCT_CONEXANT_RS7112 0x1803 /* 10/100 */

+#define PCI_PRODUCT_CONEXANT_56K_WINMODEM3 0x1804 /* 10/100 */

#define PCI_PRODUCT_CONEXANT_SOFTK56_PCI 0x2443 /* SoftK56 PCI */

#define PCI_PRODUCT_CONEXANT_HSF_56K_HSFI 0x2f00 /* HSF 56k HSFi */

/* Contaq Microsystems products */

-#define PCI_PRODUCT_CONTAQ_82C599 0x0600 /* 82C599 PCI-VLB */

-#define PCI_PRODUCT_CONTAQ_82C693 0xc693 /* CY82C693U PCI-ISA */

+#define PCI_PRODUCT_CONTAQ_82C599 0x0600 /* 82C599 VLB */

+#define PCI_PRODUCT_CONTAQ_82C693 0xc693 /* CY82C693U ISA */

/* Corollary Products */

#define PCI_PRODUCT_COROLLARY_CBUSII_PCIB 0x0014 /* C-Bus II-PCI */

@@ -885,12 +885,12 @@

#define PCI_PRODUCT_CYCLADES_CYCLOMZ_2 0x0201 /* Cyclom-Z */

/* Cyclone Microsystems products */

-#define PCI_PRODUCT_CYCLONE_PCI_700 0x0700 /* IQ80310 (PCI-700) */

+#define PCI_PRODUCT_CYCLONE_PCI_700 0x0700 /* IQ80310 */

/* Cyrix/National Semiconductor products */

#define PCI_PRODUCT_CYRIX_GXMPCI 0x0001 /* GXm Host-PCI */

-#define PCI_PRODUCT_CYRIX_GXMISA 0x0002 /* GXm PCI-ISA */

-#define PCI_PRODUCT_CYRIX_CX5530_PCIB 0x0100 /* Cx5530 South Bridge */

+#define PCI_PRODUCT_CYRIX_GXMISA 0x0002 /* GXm ISA */

+#define PCI_PRODUCT_CYRIX_CX5530_PCIB 0x0100 /* Cx5530 South */

#define PCI_PRODUCT_CYRIX_CX5530_SMI 0x0101 /* Cx5530 SMI/ACPI */

#define PCI_PRODUCT_CYRIX_CX5530_IDE 0x0102 /* Cx5530 IDE */

#define PCI_PRODUCT_CYRIX_CX5530_AUDIO 0x0103 /* Cx5530 XpressAUDIO */

@@ -955,16 +955,16 @@

/* Distributed Processing Technology products */

#define PCI_PRODUCT_DPT_SC_RAID 0xa400 /* SmartCache/Raid */

-#define PCI_PRODUCT_DPT_I960_PPB 0xa500 /* PCI-PCI bridge */

+#define PCI_PRODUCT_DPT_I960_PPB 0xa500 /* PCI-PCI */

#define PCI_PRODUCT_DPT_RAID_I2O 0xa501 /* SmartRAID (I2O) */

#define PCI_PRODUCT_DPT_2005S 0xa511 /* SmartRAID 2005S */

-#define PCI_PRODUCT_DPT_MEMCTLR 0x1012 /* Memory Controller */

+#define PCI_PRODUCT_DPT_MEMCTLR 0x1012 /* Memory Control */

/* Dolphin products */

#define PCI_PRODUCT_DOLPHIN_PCISCI 0x0658 /* PCI-SCI */

/* DTC Technology Corp products */

-#define PCI_PRODUCT_DTCTECH_DMX3194U 0x0002 /* DMX3194U SCSI */

+#define PCI_PRODUCT_DTCTECH_DMX3194U 0x0002 /* DMX3194U */

/* Dynalink products */

#define PCI_PRODUCT_DYNALINK_IS64PH 0x1702 /* IS64PH ISDN */

@@ -990,7 +990,7 @@

#define PCI_PRODUCT_ENDACE_DAG423GE 0x423e /* Endace Dag4.23GE */

/* ENE Technology products */

-#define PCI_PRODUCT_ENE_CB1410 0x1410 /* CB-1410 PCI-CardBus */

+#define PCI_PRODUCT_ENE_CB1410 0x1410 /* CB-1410 CardBus */

/* Ensoniq products */

#define PCI_PRODUCT_ENSONIQ_AUDIOPCI97 0x1371 /* AudioPCI97 */

@@ -1016,7 +1016,7 @@

#define PCI_PRODUCT_ESSENTIAL_RR_GIGE 0x0005 /* RoadRunner Gig-E */

/* Evans & Sutherland products */

-#define PCI_PRODUCT_ES_FREEDOM 0x0001 /* Freedom PCI-GBus */

+#define PCI_PRODUCT_ES_FREEDOM 0x0001 /* Freedom GBus */

/* Eumitcom Technology products */

#define PCI_PRODUCT_EUMITCOM_WL11000P 0x1100 /* WL11000P */

@@ -1077,7 +1077,7 @@

#define PCI_PRODUCT_IBM_0x000a 0x000a /* ISA w/PnP */

#define PCI_PRODUCT_IBM_0x0017 0x0017 /* CPU */

#define PCI_PRODUCT_IBM_0x0018 0x0018 /* Auto LANStreamer */

-#define PCI_PRODUCT_IBM_GXT150P 0x001b /* GXT-150P 2D Accelerator */

+#define PCI_PRODUCT_IBM_GXT150P 0x001b /* GXT-150P */

#define PCI_PRODUCT_IBM_82G2675 0x001d /* 82G2675 */

#define PCI_PRODUCT_IBM_0x0020 0x0020 /* MCA */

#define PCI_PRODUCT_IBM_82351 0x0022 /* 82351 PCI-PCI */

@@ -1086,7 +1086,7 @@

#define PCI_PRODUCT_IBM_OLYMPIC 0x003e /* Olympic */

#define PCI_PRODUCT_IBM_I82557B 0x0057 /* i82557B 10/100 */

#define PCI_PRODUCT_IBM_FIREGL2 0x0170 /* FireGL2 */

-#define PCI_PRODUCT_IBM_PCIX 0x01a7 /* PCI-X to PCI-X */

+#define PCI_PRODUCT_IBM_PCIX 0x01a7 /* PCIX-PCIX */

/* IDT products */

#define PCI_PRODUCT_IDT_77201 0x0001 /* 77201/77211 ATM (NICStAR) */

@@ -1095,11 +1095,11 @@

#define PCI_PRODUCT_INDCOMPSRC_WDT50x 0x22c0 /* WDT 50x Watchdog Timer */

/* Initio Corporation */

-#define PCI_PRODUCT_INITIO_INIC850 0x0850 /* INIC-850 (A100UW) SCSI */

-#define PCI_PRODUCT_INITIO_INIC1060 0x1060 /* INIC-1060 (A100U2W) SCSI */

-#define PCI_PRODUCT_INITIO_INIC940 0x9400 /* INIC-940 SCSI */

-#define PCI_PRODUCT_INITIO_INIC941 0x9401 /* INIC-941 SCSI */

-#define PCI_PRODUCT_INITIO_INIC950 0x9500 /* INIC-950 SCSI */

+#define PCI_PRODUCT_INITIO_INIC850 0x0850 /* INIC-850 (A100UW) */

+#define PCI_PRODUCT_INITIO_INIC1060 0x1060 /* INIC-1060 (A100U2W) */

+#define PCI_PRODUCT_INITIO_INIC940 0x9400 /* INIC-940 */

+#define PCI_PRODUCT_INITIO_INIC941 0x9401 /* INIC-941 */

+#define PCI_PRODUCT_INITIO_INIC950 0x9500 /* INIC-950 */

/* Integrated Micro Solutions products */

#define PCI_PRODUCT_IMS_8849 0x8849 /* 8849 */

@@ -1107,11 +1107,11 @@

/* Intel products */

#define PCI_PRODUCT_INTEL_21145 0x0039 /* 21145 */

#define PCI_PRODUCT_INTEL_EESISA 0x0008 /* EES ISA */

-#define PCI_PRODUCT_INTEL_80312 0x030d /* 80312 I/O Companion Chip */

-#define PCI_PRODUCT_INTEL_PCEB 0x0482 /* 82375EB PCI-EISA */

+#define PCI_PRODUCT_INTEL_80312 0x030d /* 80312 I/O Companion */

+#define PCI_PRODUCT_INTEL_PCEB 0x0482 /* 82375EB EISA */

#define PCI_PRODUCT_INTEL_CDC 0x0483 /* 82424ZX Cache/DRAM */

-#define PCI_PRODUCT_INTEL_SIO 0x0484 /* 82378IB PCI-ISA */

-#define PCI_PRODUCT_INTEL_82426EX 0x0486 /* 82426EX PCI-to-ISA */

+#define PCI_PRODUCT_INTEL_SIO 0x0484 /* 82378IB ISA */

+#define PCI_PRODUCT_INTEL_82426EX 0x0486 /* 82426EX ISA */

#define PCI_PRODUCT_INTEL_PCMC 0x04a3 /* 82434LX/NX PCI/Cache/DRAM */

#define PCI_PRODUCT_INTEL_GDT_RAID1 0x0600 /* GDT RAID */

#define PCI_PRODUCT_INTEL_GDT_RAID2 0x061f /* GDT RAID */

@@ -1186,18 +1186,18 @@

#define PCI_PRODUCT_INTEL_EEPRO100S 0x1228 /* EE Pro 100 Smart */

#define PCI_PRODUCT_INTEL_82557 0x1229 /* 82557 */

#define PCI_PRODUCT_INTEL_82437FX 0x122d /* 82437FX */

-#define PCI_PRODUCT_INTEL_82371FB_ISA 0x122e /* 82371FB PCI-ISA */

+#define PCI_PRODUCT_INTEL_82371FB_ISA 0x122e /* 82371FB ISA */

#define PCI_PRODUCT_INTEL_82371FB_IDE 0x1230 /* 82371FB IDE */

-#define PCI_PRODUCT_INTEL_82371MX 0x1234 /* 82371 PCI-ISA and IDE */

+#define PCI_PRODUCT_INTEL_82371MX 0x1234 /* 82371 ISA and IDE */

#define PCI_PRODUCT_INTEL_82437MX 0x1235 /* 82437 PCI/Cache/DRAM */

#define PCI_PRODUCT_INTEL_82441FX 0x1237 /* 82441FX */

-#define PCI_PRODUCT_INTEL_82380AB 0x123c /* 82380AB Mobile PCI-ISA */

+#define PCI_PRODUCT_INTEL_82380AB 0x123c /* 82380AB Mobile ISA */

#define PCI_PRODUCT_INTEL_82380FB 0x124b /* 82380FB Mobile PCI-PCI */

#define PCI_PRODUCT_INTEL_82439HX 0x1250 /* 82439HX */

#define PCI_PRODUCT_INTEL_82806AA 0x1360 /* 82806AA PCI64 */

#define PCI_PRODUCT_INTEL_82870P2_PPB 0x1460 /* 82870P2 P64H2 PCI-PCI */

#define PCI_PRODUCT_INTEL_82870P2_IOxAPIC 0x1461 /* P64H2 IOxAPIC */

-#define PCI_PRODUCT_INTEL_82870P2_HPLUG 0x1462 /* P64H2 Hot Plug Controller */

+#define PCI_PRODUCT_INTEL_82870P2_HPLUG 0x1462 /* P64H2 Hot Plug */

#define PCI_PRODUCT_INTEL_80960RP_ATU 0x1960 /* 80960RP ATU */

#define PCI_PRODUCT_INTEL_82840_HB 0x1a21 /* 82840 Host */

#define PCI_PRODUCT_INTEL_82840_AGP 0x1a23 /* 82840 AGP */

@@ -1281,27 +1281,27 @@

#define PCI_PRODUCT_INTEL_82845G 0x2560 /* 82845G/GL */

#define PCI_PRODUCT_INTEL_82845G_AGP 0x2561 /* 82845G/GL/GV/GE/PE Host-AGP */

#define PCI_PRODUCT_INTEL_82845G_IGD 0x2562 /* 82845G/GL Video */

-#define PCI_PRODUCT_INTEL_82865_IO_1 0x2570 /* 82865G/PE/P CPU to I/0 Bridge 1 */

-#define PCI_PRODUCT_INTEL_82865_AGP 0x2571 /* 82865G/PE/P CPU to AGP Bridge */

-#define PCI_PRODUCT_INTEL_82865_CSA 0x2573 /* 82865G/PE/P CPU to CSA Bridge */

-#define PCI_PRODUCT_INTEL_82865_IO_2 0x2576 /* 82865G/PE/P CPU to I/0 Bridge 2 */

+#define PCI_PRODUCT_INTEL_82865_IO_1 0x2570 /* 82865G/PE/P CPU-I/0-1 */

+#define PCI_PRODUCT_INTEL_82865_AGP 0x2571 /* 82865G/PE/P CPU-AGP */

+#define PCI_PRODUCT_INTEL_82865_CSA 0x2573 /* 82865G/PE/P CPU-CSA */

+#define PCI_PRODUCT_INTEL_82865_IO_2 0x2576 /* 82865G/PE/P CPU-I/0-2 */

#define PCI_PRODUCT_INTEL_82875P_HB 0x2578 /* 82875P Host */

-#define PCI_PRODUCT_INTEL_82875P_AGP 0x2579 /* 82875P PCI-AGP */

+#define PCI_PRODUCT_INTEL_82875P_AGP 0x2579 /* 82875P AGP */

#define PCI_PRODUCT_INTEL_82875P_CSA 0x257b /* 82875P PCI-CSA */

#define PCI_PRODUCT_INTEL_31244 0x3200 /* 31244 SATA */

-#define PCI_PRODUCT_INTEL_82830MP_IO_1 0x3575 /* 82830MP CPU to I/O Bridge 1 */

-#define PCI_PRODUCT_INTEL_82830MP_AGP 0x3576 /* 82830MP CPU to AGP Bridge */

+#define PCI_PRODUCT_INTEL_82830MP_IO_1 0x3575 /* 82830MP CPU-I/O-1 */

+#define PCI_PRODUCT_INTEL_82830MP_AGP 0x3576 /* 82830MP CPU-AGP */

#define PCI_PRODUCT_INTEL_82830MP_IV 0x3577 /* 82830MP Integrated Video */

-#define PCI_PRODUCT_INTEL_82830MP_IO_2 0x3578 /* 82830MP CPU to I/O Bridge 2 */

-#define PCI_PRODUCT_INTEL_82852GM_HPB 0x3580 /* 82852GM Hub-to-PCI */

+#define PCI_PRODUCT_INTEL_82830MP_IO_2 0x3578 /* 82830MP CPU-I/O-2 */

+#define PCI_PRODUCT_INTEL_82852GM_HPB 0x3580 /* 82852GM Hub-PCI */

#define PCI_PRODUCT_INTEL_82852GM_AGP 0x3582 /* 82852GM AGP */

#define PCI_PRODUCT_INTEL_82852GM_MEM 0x3584 /* 82852GM Memory */

#define PCI_PRODUCT_INTEL_82852GM_CFG 0x3585 /* 82852GM Configuration */

-#define PCI_PRODUCT_INTEL_82855PE 0x3340 /* 82855PE Host-Hub Bridge */

+#define PCI_PRODUCT_INTEL_82855PE 0x3340 /* 82855PE Host-Hub */

#define PCI_PRODUCT_INTEL_82855PE_AGP 0x3341 /* 82855PE AGP */

#define PCI_PRODUCT_INTEL_82801DBM 0x24cc /* 82801DBM LPC */

#define PCI_PRODUCT_INTEL_RCU32 0x3092 /* RCU32 I2O RAID */

-#define PCI_PRODUCT_INTEL_82371SB_ISA 0x7000 /* 82371SB PCI-ISA */

+#define PCI_PRODUCT_INTEL_82371SB_ISA 0x7000 /* 82371SB ISA */

#define PCI_PRODUCT_INTEL_82371SB_IDE 0x7010 /* 82371SB IDE */

#define PCI_PRODUCT_INTEL_82371USB 0x7020 /* 82371SB USB */

#define PCI_PRODUCT_INTEL_82437VX 0x7030 /* 82437VX */

@@ -1316,19 +1316,19 @@

#define PCI_PRODUCT_INTEL_82810_DC100_GC 0x7123 /* 82810-DC100 Graphics */

#define PCI_PRODUCT_INTEL_82810E_MCH 0x7124 /* 82810E */

#define PCI_PRODUCT_INTEL_82810E_GC 0x7125 /* 82810E Graphics */

-#define PCI_PRODUCT_INTEL_82443LX 0x7180 /* 82443LX PCI-AGP */

+#define PCI_PRODUCT_INTEL_82443LX 0x7180 /* 82443LX AGP */

#define PCI_PRODUCT_INTEL_82443LX_AGP 0x7181 /* 82443LX AGP */

-#define PCI_PRODUCT_INTEL_82443BX 0x7190 /* 82443BX PCI-AGP */

+#define PCI_PRODUCT_INTEL_82443BX 0x7190 /* 82443BX AGP */

#define PCI_PRODUCT_INTEL_82443BX_AGP 0x7191 /* 82443BX AGP */

#define PCI_PRODUCT_INTEL_82443BX_NOAGP 0x7192 /* 82443BX */

#define PCI_PRODUCT_INTEL_82440MX 0x7194 /* 82440MX Host */

#define PCI_PRODUCT_INTEL_82440MX_ACA 0x7195 /* 82440MX AC97 Audio */

#define PCI_PRODUCT_INTEL_82440MX_ACM 0x7196 /* 82440MX AC97 Modem */

-#define PCI_PRODUCT_INTEL_82440MX_ISA 0x7198 /* 82440MX PCI-ISA */

+#define PCI_PRODUCT_INTEL_82440MX_ISA 0x7198 /* 82440MX ISA */

#define PCI_PRODUCT_INTEL_82440MX_IDE 0x7199 /* 82440MX IDE */

#define PCI_PRODUCT_INTEL_82440MX_USB 0x719a /* 82440MX USB */

#define PCI_PRODUCT_INTEL_82440MX_PM 0x719b /* 82440MX Power Mgmt */

-#define PCI_PRODUCT_INTEL_82440BX 0x71a0 /* 82440BX PCI-AGP */

+#define PCI_PRODUCT_INTEL_82440BX 0x71a0 /* 82440BX AGP */

#define PCI_PRODUCT_INTEL_82440BX_AGP 0x71a1 /* 82440BX AGP */

#define PCI_PRODUCT_INTEL_82443GX 0x71a2 /* 82443GX */

#define PCI_PRODUCT_INTEL_82740 0x7800 /* 82740 AGP */

@@ -1338,7 +1338,7 @@

#define PCI_PRODUCT_INTEL_82454NX 0x84cb /* 82454NX PXB */

#define PCI_PRODUCT_INTEL_82802AB 0x89ad /* 82802AB Firmware Hub 4Mbit */

#define PCI_PRODUCT_INTEL_82802AC 0x89ac /* 82802AC Firmware Hub 8Mbit */

-#define PCI_PRODUCT_INTEL_I2OPCIB 0x9620 /* I2O RAID PCI to PCI Bridge */

+#define PCI_PRODUCT_INTEL_I2OPCIB 0x9620 /* I2O RAID PCI-PCI */

#define PCI_PRODUCT_INTEL_RCU21 0x9621 /* RCU21 I2O RAID */

#define PCI_PRODUCT_INTEL_RCUxx 0x9622 /* RCUxx I2O RAID */

#define PCI_PRODUCT_INTEL_RCU31 0x9641 /* RCU31 I2O RAID */

@@ -1459,13 +1459,13 @@

#define PCI_PRODUCT_MADGE_SMARTRN2 0x0002 /* Smart 16/4 PCI Ringnode Mk2 */

#define PCI_PRODUCT_MADGE_SMARTRN3 0x0003 /* Smart 16/4 PCI Ringnode Mk3 */

#define PCI_PRODUCT_MADGE_SMARTRN1 0x0004 /* Smart 16/4 PCI Ringnode Mk1 */

-#define PCI_PRODUCT_MADGE_164CB 0x0006 /* 16/4 Cardbus Adapter */

-#define PCI_PRODUCT_MADGE_PRESTO 0x0007 /* Presto PCI Adapter */

+#define PCI_PRODUCT_MADGE_164CB 0x0006 /* 16/4 Cardbus */

+#define PCI_PRODUCT_MADGE_PRESTO 0x0007 /* Presto PCI */

#define PCI_PRODUCT_MADGE_SMARTHSRN100 0x0009 /* Smart 100/16/4 PCI-HS Ringnode */

#define PCI_PRODUCT_MADGE_SMARTRN100 0x000a /* Smart 100/16/4 PCI Ringnode */

-#define PCI_PRODUCT_MADGE_164CB2 0x000b /* 16/4 CardBus Adapter Mk2 */

-#define PCI_PRODUCT_MADGE_COLLAGE25 0x1000 /* Collage 25 ATM adapter */

-#define PCI_PRODUCT_MADGE_COLLAGE155 0x1001 /* Collage 155 ATM adapter */

+#define PCI_PRODUCT_MADGE_164CB2 0x000b /* 16/4 CardBus Mk2 */

+#define PCI_PRODUCT_MADGE_COLLAGE25 0x1000 /* Collage 25 ATM */

+#define PCI_PRODUCT_MADGE_COLLAGE155 0x1001 /* Collage 155 ATM */

/* Martin-Marietta */

#define PCI_PRODUCT_MARTINMARIETTA_I740 0x00d1 /* i740 PCI */

@@ -1499,7 +1499,7 @@

#define PCI_PRODUCT_MITSUBISHIELEC_GUI 0x0304 /* GUI Accel */

/* Motorola products */

-#define PCI_PRODUCT_MOT_MPC105 0x0001 /* MPC105 PCI bridge */

+#define PCI_PRODUCT_MOT_MPC105 0x0001 /* MPC105 PCI */

#define PCI_PRODUCT_MOT_MPC106 0x0002 /* MPC106 Host-PCI */

#define PCI_PRODUCT_MOT_SM56 0x5600 /* SM56 */

#define PCI_PRODUCT_MOT_RAVEN 0x4801 /* Raven Host-PCI */

@@ -1680,7 +1680,7 @@

#define PCI_PRODUCT_NVIDIA_RIVA_TNT2_ULTRA 0x0029 /* Riva TNT2 Ultra */

#define PCI_PRODUCT_NVIDIA_VANTA1 0x002c /* Vanta */

#define PCI_PRODUCT_NVIDIA_VANTA2 0x002d /* Vanta */

-#define PCI_PRODUCT_NVIDIA_NFORCE2_ISA 0x0060 /* nForce2 PCI-ISA */

+#define PCI_PRODUCT_NVIDIA_NFORCE2_ISA 0x0060 /* nForce2 ISA */

#define PCI_PRODUCT_NVIDIA_NFORCE2_SMB 0x0064 /* nForce2 SMBus */

#define PCI_PRODUCT_NVIDIA_NFORCE2_IDE 0x0065 /* nForce2 IDE */

#define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066 /* nForce2 LAN */

@@ -1726,9 +1726,9 @@

#define PCI_PRODUCT_NVIDIA_NFORCE_MEM 0x01ac /* nForce 220/420 */

#define PCI_PRODUCT_NVIDIA_NFORCE_MEM1 0x01ad /* nForce 220/420 */

#define PCI_PRODUCT_NVIDIA_NFORCE_ACA 0x01b1 /* nForce AC-97 Audio */

-#define PCI_PRODUCT_NVIDIA_NFORCE_ISA 0x01b2 /* nForce PCI-ISA */

+#define PCI_PRODUCT_NVIDIA_NFORCE_ISA 0x01b2 /* nForce ISA */

#define PCI_PRODUCT_NVIDIA_NFORCE_SMB 0x01b4 /* nForce SMBus */

-#define PCI_PRODUCT_NVIDIA_NFORCE_AGP 0x01b7 /* nForce PCI-AGP */

+#define PCI_PRODUCT_NVIDIA_NFORCE_AGP 0x01b7 /* nForce AGP */

#define PCI_PRODUCT_NVIDIA_NFORCE_PPB 0x01b8 /* nForce PCI-PCI */

#define PCI_PRODUCT_NVIDIA_NFORCE_IDE 0x01bc /* nForce IDE */

#define PCI_PRODUCT_NVIDIA_NFORCE_USB 0x01c2 /* nForce USB */

@@ -1765,7 +1765,7 @@

/* Opti products */

#define PCI_PRODUCT_OPTI_82C557 0xc557 /* 82C557 Host */

-#define PCI_PRODUCT_OPTI_82C558 0xc558 /* 82C558 PCI-ISA */

+#define PCI_PRODUCT_OPTI_82C558 0xc558 /* 82C558 ISA */

#define PCI_PRODUCT_OPTI_82C568 0xc568 /* 82C568 IDE */

#define PCI_PRODUCT_OPTI_82D568 0xd568 /* 82D568 IDE */

#define PCI_PRODUCT_OPTI_82C621 0xc621 /* 82C621 IDE */

@@ -1821,9 +1821,9 @@

#define PCI_PRODUCT_RCC_CSB6_IDE2 0x0217 /* CSB6 IDE */

#define PCI_PRODUCT_RCC_USB 0x0220 /* OSB4/CSB5 USB */

#define PCI_PRODUCT_RCC_CSB6_USB 0x0221 /* CSB6 USB */

-#define PCI_PRODUCT_RCC_CSB5BRIDGE 0x0225 /* CSB5 PCI Bridge */

+#define PCI_PRODUCT_RCC_CSB5BRIDGE 0x0225 /* CSB5 PCI */

#define PCI_PRODUCT_RCC_CSB6_LPC 0x0227 /* CSB6 LPC */

-#define PCI_PRODUCT_RCC_ISA 0x0230 /* PCI/ISA Bridge */

+#define PCI_PRODUCT_RCC_ISA 0x0230 /* PCI/ISA */

/* Picopower */

#define PCI_PRODUCT_PICOPOWER_PT80C826 0x0000 /* PT80C826 */

@@ -1894,15 +1894,15 @@

#define PCI_PRODUCT_REALTEK_RT8169 0x8169 /* 8169 */

/* RICOH products */

-#define PCI_PRODUCT_RICOH_RF5C465 0x0465 /* 5C465 PCI-CardBus */

-#define PCI_PRODUCT_RICOH_RF5C466 0x0466 /* 5C466 PCI-CardBus */

-#define PCI_PRODUCT_RICOH_RF5C475 0x0475 /* 5C475 PCI-CardBus */

-#define PCI_PRODUCT_RICOH_RF5C476 0x0476 /* 5C476 PCI-CardBus */

-#define PCI_PRODUCT_RICOH_RF5C477 0x0477 /* 5C477 PCI-CardBus */

-#define PCI_PRODUCT_RICOH_RF5C478 0x0478 /* 5C478 PCI-CardBus */

-#define PCI_PRODUCT_RICOH_R5C521 0x0521 /* 5C521 PCI-Firewire */

-#define PCI_PRODUCT_RICOH_R5C551 0x0551 /* 5C551 PCI-Firewire */

-#define PCI_PRODUCT_RICOH_RL5C552 0x0552 /* 5C552 PCI-Firewire */

+#define PCI_PRODUCT_RICOH_RF5C465 0x0465 /* 5C465 CardBus */

+#define PCI_PRODUCT_RICOH_RF5C466 0x0466 /* 5C466 CardBus */

+#define PCI_PRODUCT_RICOH_RF5C475 0x0475 /* 5C475 CardBus */

+#define PCI_PRODUCT_RICOH_RF5C476 0x0476 /* 5C476 CardBus */

+#define PCI_PRODUCT_RICOH_RF5C477 0x0477 /* 5C477 CardBus */

+#define PCI_PRODUCT_RICOH_RF5C478 0x0478 /* 5C478 CardBus */

+#define PCI_PRODUCT_RICOH_R5C521 0x0521 /* 5C521 Firewire */

+#define PCI_PRODUCT_RICOH_R5C551 0x0551 /* 5C551 Firewire */

+#define PCI_PRODUCT_RICOH_RL5C552 0x0552 /* 5C552 Firewire */

/* Rockwell products */

#define PCI_PRODUCT_ROCKWELL_RS56SP_PCI11P1 0x2005 /* RS56/SP-PCI11P1 Modem */

@@ -1974,9 +1974,9 @@

#define PCI_PRODUCT_SIS_86C201 0x0001 /* 86C201 Host-AGP */

#define PCI_PRODUCT_SIS_86C202 0x0002 /* 86C202 VGA */

#define PCI_PRODUCT_SIS_86C205_1 0x0005 /* 86C205 */

-#define PCI_PRODUCT_SIS_85C503 0x0008 /* 85C503 PCI System I/O Chipset */

-#define PCI_PRODUCT_SIS_5595 0x0009 /* 5595 PCI System I/O Chipset */

-#define PCI_PRODUCT_SIS_85C503_ISA 0x0018 /* 85C503 PCI-ISA */

+#define PCI_PRODUCT_SIS_85C503 0x0008 /* 85C503 System */

+#define PCI_PRODUCT_SIS_5595 0x0009 /* 5595 System */

+#define PCI_PRODUCT_SIS_85C503_ISA 0x0018 /* 85C503 ISA */

#define PCI_PRODUCT_SIS_5597VGA 0x0200 /* 5597/5598 VGA */

#define PCI_PRODUCT_SIS_6215 0x0204 /* 6215 */

#define PCI_PRODUCT_SIS_86C205_2 0x0205 /* 86C205 */

@@ -2072,7 +2072,7 @@

#define PCI_PRODUCT_SUN_EBUS 0x1000 /* PCIO Ebus2 */

#define PCI_PRODUCT_SUN_HME 0x1001 /* HME */

#define PCI_PRODUCT_SUN_EBUSIII 0x1100 /* PCIO Ebus2 (US III) */

-#define PCI_PRODUCT_SUN_ERINETWORK 0x1101 /* ERI Ethernet */

+#define PCI_PRODUCT_SUN_ERINETWORK 0x1101 /* ERI Ether */

#define PCI_PRODUCT_SUN_FIREWIRE 0x1102 /* FireWire */

#define PCI_PRODUCT_SUN_USB 0x1103 /* USB */

#define PCI_PRODUCT_SUN_GEMNETWORK 0x2bad /* GEM */

@@ -2083,11 +2083,11 @@

#define PCI_PRODUCT_SUN_MS_IIep 0x9000 /* microSPARC IIep PCI */

#define PCI_PRODUCT_SUN_US_IIi 0xa000 /* UltraSPARC IIi PCI */

#define PCI_PRODUCT_SUN_US_IIe 0xa001 /* UltraSPARC IIe PCI */

-#define PCI_PRODUCT_SUN_CE 0xabba /* Cassini Ethernet */

+#define PCI_PRODUCT_SUN_CE 0xabba /* Cassini Ether */

/* Sundance products */

#define PCI_PRODUCT_SUNDANCE_ST201 0x0201 /* ST201 */

-#define PCI_PRODUCT_SUNDANCE_ST2021 0x2021 /* ST2021 Gigabit Ethernet */

+#define PCI_PRODUCT_SUNDANCE_ST2021 0x2021 /* ST2021 */

/* Sunix */

#define PCI_PRODUCT_SUNIX_40XX 0x7168 /* 40XX */

@@ -2107,7 +2107,7 @@

#define PCI_PRODUCT_SYMPHONY_82C103 0x0103 /* 82C103 */

#define PCI_PRODUCT_SYMPHONY_82C105 0x0105 /* 82C105 */

#define PCI_PRODUCT_SYMPHONY2_82C101 0x0001 /* 82C101 */

-#define PCI_PRODUCT_SYMPHONY_82C565 0x0565 /* 82C565 PCI-ISA */

+#define PCI_PRODUCT_SYMPHONY_82C565 0x0565 /* 82C565 ISA */

/* Tamarack Microelectronics */

#define PCI_PRODUCT_TAMARACK_TC9021 0x1021 /* Tamarack TC9021 GigE */

@@ -2140,29 +2140,29 @@

#define PCI_PRODUCT_TI_TSB43AB21 0x8026 /* TSB43AB21 FireWire */

#define PCI_PRODUCT_TI_PCI4451_FW 0x8027 /* PCI4451 FireWire */

#define PCI_PRODUCT_TI_DWL520P 0x8400 /* DWL-520+ */

-#define PCI_PRODUCT_TI_PCI1130 0xac12 /* PCI1130 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1031 0xac13 /* PCI1031 PCI-pcmcia */

-#define PCI_PRODUCT_TI_PCI1131 0xac15 /* PCI1131 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1250 0xac16 /* PCI1250 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1220 0xac17 /* PCI1220 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1221 0xac19 /* PCI1221 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1450 0xac1b /* PCI1450 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1225 0xac1c /* PCI1225 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1251 0xac1d /* PCI1251 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1211 0xac1e /* PCI1211 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1251B 0xac1f /* PCI1251B PCI-CardBus */

+#define PCI_PRODUCT_TI_PCI1130 0xac12 /* PCI1130 CardBus */

+#define PCI_PRODUCT_TI_PCI1031 0xac13 /* PCI1031 pcmcia */

+#define PCI_PRODUCT_TI_PCI1131 0xac15 /* PCI1131 CardBus */

+#define PCI_PRODUCT_TI_PCI1250 0xac16 /* PCI1250 CardBus */

+#define PCI_PRODUCT_TI_PCI1220 0xac17 /* PCI1220 CardBus */

+#define PCI_PRODUCT_TI_PCI1221 0xac19 /* PCI1221 CardBus */

+#define PCI_PRODUCT_TI_PCI1450 0xac1b /* PCI1450 CardBus */

+#define PCI_PRODUCT_TI_PCI1225 0xac1c /* PCI1225 CardBus */

+#define PCI_PRODUCT_TI_PCI1251 0xac1d /* PCI1251 CardBus */

+#define PCI_PRODUCT_TI_PCI1211 0xac1e /* PCI1211 CardBus */

+#define PCI_PRODUCT_TI_PCI1251B 0xac1f /* PCI1251B CardBus */

#define PCI_PRODUCT_TI_PCI2030 0xac20 /* PCI2030 PCI-PCI */

#define PCI_PRODUCT_TI_PCI2031 0xac21 /* PCI2031 PCI-PCI */

-#define PCI_PRODUCT_TI_PCI4451_CB 0xac42 /* PCI4451 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI4510 0xac44 /* PCI4510 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI4520 0xac46 /* PCI4520 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1410 0xac50 /* PCI1410 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1420 0xac51 /* PCI1420 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1451 0xac52 /* PCI1451 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1421 0xac53 /* PCI1421 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1520 0xac55 /* PCI1520 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI1510 0xac56 /* PCI1510 PCI-CardBus */

-#define PCI_PRODUCT_TI_PCI2040 0xac60 /* PCI2040 PCI-DSP */

+#define PCI_PRODUCT_TI_PCI4451_CB 0xac42 /* PCI4451 CardBus */

+#define PCI_PRODUCT_TI_PCI4510 0xac44 /* PCI4510 CardBus */

+#define PCI_PRODUCT_TI_PCI4520 0xac46 /* PCI4520 CardBus */

+#define PCI_PRODUCT_TI_PCI1410 0xac50 /* PCI1410 CardBus */

+#define PCI_PRODUCT_TI_PCI1420 0xac51 /* PCI1420 CardBus */

+#define PCI_PRODUCT_TI_PCI1451 0xac52 /* PCI1451 CardBus */

+#define PCI_PRODUCT_TI_PCI1421 0xac53 /* PCI1421 CardBus */

+#define PCI_PRODUCT_TI_PCI1520 0xac55 /* PCI1520 CardBus */

+#define PCI_PRODUCT_TI_PCI1510 0xac56 /* PCI1510 CardBus */

+#define PCI_PRODUCT_TI_PCI2040 0xac60 /* PCI2040 DSP */

/* TigerJet Network products */

#define PCI_PRODUCT_TIGERJET_TIGER320 0x0001 /* PCI interface */

@@ -2177,11 +2177,11 @@

/* Toshiba(2) products */

#define PCI_PRODUCT_TOSHIBA2_THB 0x0601 /* Host-PCI */

-#define PCI_PRODUCT_TOSHIBA2_ISA 0x0602 /* PCI-ISA */

+#define PCI_PRODUCT_TOSHIBA2_ISA 0x0602 /* ISA */

#define PCI_PRODUCT_TOSHIBA2_ToPIC95 0x0603 /* ToPIC95 CardBus-PCI */

-#define PCI_PRODUCT_TOSHIBA2_ToPIC95B 0x060a /* ToPIC95B PCI-CardBus */

-#define PCI_PRODUCT_TOSHIBA2_ToPIC97 0x060f /* ToPIC97 PCI-CardBus */

-#define PCI_PRODUCT_TOSHIBA2_ToPIC100 0x0617 /* ToPIC100 PCI-CardBus */

+#define PCI_PRODUCT_TOSHIBA2_ToPIC95B 0x060a /* ToPIC95B CardBus */

+#define PCI_PRODUCT_TOSHIBA2_ToPIC97 0x060f /* ToPIC97 CardBus */

+#define PCI_PRODUCT_TOSHIBA2_ToPIC100 0x0617 /* ToPIC100 CardBus */

#define PCI_PRODUCT_TOSHIBA2_TFIRO 0x0701 /* Fast Infrared Type O */

/* Transmeta products */

@@ -2236,7 +2236,7 @@

#define PCI_PRODUCT_TSENG_ET6300 0x4702 /* ET6300 */

/* UMC products */

-#define PCI_PRODUCT_UMC_UM82C881 0x0001 /* UM82C881 486 Chipset */

+#define PCI_PRODUCT_UMC_UM82C881 0x0001 /* UM82C881 486 */

#define PCI_PRODUCT_UMC_UM82C886 0x0002 /* UM82C886 ISA */

#define PCI_PRODUCT_UMC_UM8673F 0x0101 /* UM8673F EIDE */

#define PCI_PRODUCT_UMC_UM8881 0x0881 /* UM8881 HB4 486 PCI */

@@ -2245,12 +2245,12 @@

#define PCI_PRODUCT_UMC_UM8886BF 0x673a /* UM8886BF */

#define PCI_PRODUCT_UMC_UM8710 0x8710 /* UM8710 */

#define PCI_PRODUCT_UMC_UM8886 0x886a /* UM8886 */

-#define PCI_PRODUCT_UMC_UM8881F 0x8881 /* UM8881F PCI-Host */

-#define PCI_PRODUCT_UMC_UM8886F 0x8886 /* UM8886F PCI-ISA */

+#define PCI_PRODUCT_UMC_UM8881F 0x8881 /* UM8881F Host */

+#define PCI_PRODUCT_UMC_UM8886F 0x8886 /* UM8886F ISA */

#define PCI_PRODUCT_UMC_UM8886A 0x888a /* UM8886A */

#define PCI_PRODUCT_UMC_UM8891A 0x8891 /* UM8891A */

#define PCI_PRODUCT_UMC_UM9017F 0x9017 /* UM9017F */

-#define PCI_PRODUCT_UMC_UM8886E_OR_WHAT 0xe886 /* PCI-ISA */

+#define PCI_PRODUCT_UMC_UM8886E_OR_WHAT 0xe886 /* ISA */

#define PCI_PRODUCT_UMC_UM8886N 0xe88a /* UM8886N */

#define PCI_PRODUCT_UMC_UM8891N 0xe891 /* UM8891N */

@@ -2275,20 +2275,20 @@

#define PCI_PRODUCT_VIATECH_VT82C561 0x0561 /* VT82C561 */

#define PCI_PRODUCT_VIATECH_VT82C571 0x0571 /* VT82C571 IDE */

#define PCI_PRODUCT_VIATECH_VT82C576 0x0576 /* VT82C576 3V */

-#define PCI_PRODUCT_VIATECH_VT82C585 0x0585 /* VT82C585 PCI-ISA */

-#define PCI_PRODUCT_VIATECH_VT82C586_ISA 0x0586 /* VT82C586 PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT82C585 0x0585 /* VT82C585 ISA */

+#define PCI_PRODUCT_VIATECH_VT82C586_ISA 0x0586 /* VT82C586 ISA */

#define PCI_PRODUCT_VIATECH_VT82C595 0x0595 /* VT82C595 Host-PCI */

-#define PCI_PRODUCT_VIATECH_VT82C596A 0x0596 /* VT82C596A PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT82C596A 0x0596 /* VT82C596A ISA */

#define PCI_PRODUCT_VIATECH_VT82C597PCI 0x0597 /* VT82C597 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT82C598PCI 0x0598 /* VT82C598 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT8601 0x0601 /* VT8601 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT8605 0x0605 /* VT8605 Host-PCI */

-#define PCI_PRODUCT_VIATECH_VT82C686A_ISA 0x0686 /* VT82C686 PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT82C686A_ISA 0x0686 /* VT82C686 ISA */

#define PCI_PRODUCT_VIATECH_VT82C691 0x0691 /* VT82C691 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT82C693 0x0693 /* VT82C693 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT86C926 0x0926 /* VT86C926 Amazon */

#define PCI_PRODUCT_VIATECH_VT82C570M 0x1000 /* VT82C570M Host-PCI */

-#define PCI_PRODUCT_VIATECH_VT82C570MV 0x1006 /* VT82C570M PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT82C570MV 0x1006 /* VT82C570M ISA */

#define PCI_PRODUCT_VIATECH_VT82C416 0x1571 /* VT82C416 IDE */

#define PCI_PRODUCT_VIATECH_VT82C1595 0x1595 /* VT82C1595 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT83C572 0x3038 /* VT83C572 USB */

@@ -2301,33 +2301,33 @@

#define PCI_PRODUCT_VIATECH_VT8233_AC97 0x3059 /* VT8233 AC97 Audio */

#define PCI_PRODUCT_VIATECH_RHINEII_2 0x3065 /* RhineII-2 */

#define PCI_PRODUCT_VIATECH_VT82C686A_ACM 0x3068 /* VT82C686 AC97 Modem */

-#define PCI_PRODUCT_VIATECH_VT8366_ISA 0x3074 /* VT8366 PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT8366_ISA 0x3074 /* VT8366 ISA */

#define PCI_PRODUCT_VIATECH_VT8366 0x3099 /* VT8366 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT6202 0x3104 /* VT6202 USB 2.0 */

#define PCI_PRODUCT_VIATECH_VT6105 0x3106 /* VT6105 RhineIII */

#define PCI_PRODUCT_VIATECH_VT8375 0x3116 /* VT8375 Host-PCI */

#define PCI_PRODUCT_VIATECH_CLE266 0x3122 /* CLE266 */

#define PCI_PRODUCT_VIATECH_VT8623 0x3123 /* VT8623 Host-PCI */

-#define PCI_PRODUCT_VIATECH_VT8233_ISA 0x3147 /* VT8233 PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT8233_ISA 0x3147 /* VT8233 ISA */

#define PCI_PRODUCT_VIATECH_VT8751 0x3148 /* VT8751 Host-PCI */

#define PCI_PRODUCT_VIATECH_VT8237_SATA 0x3149 /* VT8237 SATA */

-#define PCI_PRODUCT_VIATECH_VT8235_ISA 0x3177 /* VT8235 PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT8235_ISA 0x3177 /* VT8235 ISA */

#define PCI_PRODUCT_VIATECH_VT8377 0x3189 /* VT8377 Host-PCI */

-#define PCI_PRODUCT_VIATECH_VT8237_ISA 0x3227 /* VT8237 PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT8237_ISA 0x3227 /* VT8237 ISA */

#define PCI_PRODUCT_VIATECH_RHINEII 0x6100 /* RhineII */

-#define PCI_PRODUCT_VIATECH_VT8231_ISA 0x8231 /* VT8231 PCI-ISA */

+#define PCI_PRODUCT_VIATECH_VT8231_ISA 0x8231 /* VT8231 ISA */

#define PCI_PRODUCT_VIATECH_VT8231_PWR 0x8235 /* VT8231 PMG */

-#define PCI_PRODUCT_VIATECH_VT8363_AGP 0x8305 /* VT8363 PCI-AGP */

+#define PCI_PRODUCT_VIATECH_VT8363_AGP 0x8305 /* VT8363 AGP */

#define PCI_PRODUCT_VIATECH_VT8371_PPB 0x8391 /* VT8371 PCI-PCI */

-#define PCI_PRODUCT_VIATECH_VT8501_AGP 0x8501 /* VT8501 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT82C601 0x8601 /* VT82C601 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT82C597AGP 0x8597 /* VT82C597 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT82C598AGP 0x8598 /* VT82C598 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT8605_AGP 0x8605 /* VT8605 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT8633_AGP 0xb091 /* VT8633 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT8366_AGP 0xb099 /* VT8366 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT8235_AGP 0xb168 /* VT8235 PCI-AGP */

-#define PCI_PRODUCT_VIATECH_VT8377_AGP 0xb198 /* VT8377 PCI-AGP */

+#define PCI_PRODUCT_VIATECH_VT8501_AGP 0x8501 /* VT8501 AGP */

+#define PCI_PRODUCT_VIATECH_VT82C601 0x8601 /* VT82C601 AGP */

+#define PCI_PRODUCT_VIATECH_VT82C597AGP 0x8597 /* VT82C597 AGP */

+#define PCI_PRODUCT_VIATECH_VT82C598AGP 0x8598 /* VT82C598 AGP */

+#define PCI_PRODUCT_VIATECH_VT8605_AGP 0x8605 /* VT8605 AGP */

+#define PCI_PRODUCT_VIATECH_VT8633_AGP 0xb091 /* VT8633 AGP */

+#define PCI_PRODUCT_VIATECH_VT8366_AGP 0xb099 /* VT8366 AGP */

+#define PCI_PRODUCT_VIATECH_VT8235_AGP 0xb168 /* VT8235 AGP */

+#define PCI_PRODUCT_VIATECH_VT8377_AGP 0xb198 /* VT8377 AGP */

/* Vortex Computer Systems products */

#define PCI_PRODUCT_VORTEX_GDT_60x0 0x0000 /* GDT6000/6020/6050 */

@@ -2436,9 +2436,9 @@

#define PCI_PRODUCT_WINBOND_W83769F 0x0001 /* W83769F */

#define PCI_PRODUCT_WINBOND_W89C840F 0x0840 /* W89C840F 10/100 */

#define PCI_PRODUCT_WINBOND_W89C940F 0x0940 /* Linksys EtherPCI II */

-#define PCI_PRODUCT_WINBOND_W83C553F_0 0x0565 /* W83C553F PCI-ISA Bridge */

-#define PCI_PRODUCT_WINBOND_W83C553F_1 0x0105 /* W83C553F IDE Controller */

-#define PCI_PRODUCT_WINBOND_W89C940F_1 0x5a5a /* W89C940F Ethernet */

+#define PCI_PRODUCT_WINBOND_W83C553F_0 0x0565 /* W83C553F ISA */

+#define PCI_PRODUCT_WINBOND_W83C553F_1 0x0105 /* W83C553F */

+#define PCI_PRODUCT_WINBOND_W89C940F_1 0x5a5a /* W89C940F */

#define PCI_PRODUCT_WINBOND_W6692 0x6692 /* W6692 ISDN */

/* Winbond Electronics products (PCI products set 2) */

@@ -2447,7 +2447,7 @@

/* Xircom products */

#define PCI_PRODUCT_XIRCOM_X3201_3 0x0002 /* X3201-3 */

#define PCI_PRODUCT_XIRCOM_X3201_3_21143 0x0003 /* X3201-3 (21143) */

-#define PCI_PRODUCT_XIRCOM_MPCI_MODEM 0x000c /* MiniPCI Modem */

+#define PCI_PRODUCT_XIRCOM_MPCI_MODEM 0x000c /* Modem */

/* Yamaha products */

#define PCI_PRODUCT_YAMAHA_YMF724 0x0004 /* 724 */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 0fb7db85efc..e49b6fb4c7b 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.696 2003/12/12 22:56:59 deraadt Exp

+ * OpenBSD: pcidevs,v 1.697 2003/12/15 00:40:56 deraadt Exp

/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */

@@ -40,15 +40,15 @@

static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6832,

- "OZ6832 and OZ6836 CardBus",

+ "OZ6832 CardBus",

{

PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6836,

- "OZ6836 and OZ6860 CardBus",

+ "OZ6836/OZ6860 CardBus",

{

PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6872,

- "OZ6812 and OZ6872 CardBus",

+ "OZ68[17]2 CardBus",

{

PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6922,

@@ -60,7 +60,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6972,

- "OZ6912 and OZ6972 CardBus",

+ "OZ69[17]2 CardBus",

{

PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C985,

@@ -296,11 +296,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PC4800_1,

- "Cisco PC4800 Wireless",

+ "PC4800 Wireless",

{

PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PCI352,

- "Cisco/Aironet PCI35x WLAN",

+ "PCI35x WLAN",

{

PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PC4500,

@@ -328,47 +328,47 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_ATP850U,

- "ATP850U/UF IDE",

+ "ATP850U/UF",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_ATP860,

- "ATP860 IDE",

+ "ATP860",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_ATP860A,

- "ATP860-A IDE",

+ "ATP860-A",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_ATP865A,

- "ATP865-A IDE",

+ "ATP865-A",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_ATP865R,

- "ATP865-R IDE",

+ "ATP865-R",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_AEC6710,

- "AEC6710 SCSI",

+ "AEC6710",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_AEC6712UW,

- "AEC6712UW SCSI",

+ "AEC6712UW",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_AEC6712U,

- "AEC6712U SCSI",

+ "AEC6712U",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_AEC6712S,

- "AEC6712S SCSI",

+ "AEC6712S",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_AEC6710D,

- "AEC6710D SCSI",

+ "AEC6710D",

{

PCI_VENDOR_ACARD, PCI_PRODUCT_ACARD_AEC6715UW,

- "AEC6715UW SCSI",

+ "AEC6715UW",

{

PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_5030,

@@ -400,7 +400,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1449,

- "M1449 PCI-ISA",

+ "M1449 ISA",

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1451,

@@ -420,7 +420,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1523,

- "M1523 PCI-ISA",

+ "M1523 ISA",

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1531,

@@ -428,7 +428,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1533,

- "M1533 PCI-ISA",

+ "M1533 ISA",

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1535,

@@ -436,7 +436,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1543,

- "M1543 PCI-ISA",

+ "M1543 ISA",

{

PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1541,

@@ -764,19 +764,19 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCNET_PCI,

- "79c970 PCnet-PCI LANCE",

+ "79c970 PCnet-PCI",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCHOME_PCI,

- "79c978 PChome-PCI LANCE",

+ "79c978 PChome-PCI",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCSCSI_PCI,

- "53c974 PCscsi-PCI SCSI",

+ "53c974 PCscsi-PCI",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCNETS_PCI,

- "79C974 PCnet-PCI Ether+SCSI",

+ "79C974 PCnet-PCI",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_ELANSC520,

@@ -784,7 +784,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_SC751_SC,

- "751 System Controller",

+ "751 System",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_SC751_PPB,

@@ -808,7 +808,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_755_ISA,

- "755 PCI-ISA",

+ "755 ISA",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_755_IDE,

@@ -824,7 +824,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC756_ISA,

- "756 PCI-ISA",

+ "756 ISA",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC756_IDE,

@@ -840,7 +840,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_766_ISA,

- "766 PCI-ISA",

+ "766 ISA",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_766_IDE,

@@ -860,7 +860,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC768_ISA,

- "768 PCI-ISA",

+ "768 ISA",

{

PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC768_IDE,

@@ -1036,15 +1036,15 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH_AGP3,

- "UniNorth AGP Bridge",

+ "UniNorth AGP",

{

PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH5,

- "UniNorth Host-PCI Bridge",

+ "UniNorth Host-PCI",

{

PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH6,

- "UniNorth Host-PCI Bridge",

+ "UniNorth Host-PCI",

{

PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_INTREPID_ATA,

@@ -1456,11 +1456,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_BIT3, PCI_PRODUCT_BIT3_PCIVME617,

- "PCI-VME 617",

+ "VME 617",

{

PCI_VENDOR_BIT3, PCI_PRODUCT_BIT3_PCIVME2706,

- "PCI-VME 2706",

+ "VME 2706",

{

PCI_VENDOR_BLUESTEEL, PCI_PRODUCT_BLUESTEEL_5501,

@@ -1588,7 +1588,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT8474,

- "Bt8474 Multichannel HDLC Controller",

+ "Bt8474 HDLC",

{

PCI_VENDOR_BUSLOGIC, PCI_PRODUCT_BUSLOGIC_MULTIMASTER_NC,

@@ -1696,11 +1696,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_PD6832,

- "CL-PD6832 PCI-CardBus",

+ "CL-PD6832 CardBus",

{

PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_PD6833,

- "CL-PD6833 PCI-CardBus",

+ "CL-PD6833 CardBus",

{

PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_GD7542,

@@ -1788,11 +1788,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_EISA_BRIDGE,

- "PCI-EISA",

+ "EISA",

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE,

- "PCI-ISA",

+ "ISA",

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_TRIFLEX1,

@@ -1860,11 +1860,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE1,

- "PCI-ISA",

+ "ISA",

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_HOTPLUG,

- "PCI Hotplug controller",

+ "PCI Hotplug",

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_OHCI,

@@ -1876,11 +1876,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE3,

- "PCI-ISA",

+ "ISA",

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISAPNP,

- "PCI-ISAPnP",

+ "ISAPnP",

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_N100TX,

@@ -1908,7 +1908,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE2,

- "PCI-ISA",

+ "ISA",

{

PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE1,

@@ -1968,11 +1968,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_RS7112,

- "10/100 MiniPCI Ethernet",

+ "10/100",

{

PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM3,

- "10/100 MiniPCI Ethernet",

+ "10/100",

{

PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_SOFTK56_PCI,

@@ -1984,11 +1984,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_CONTAQ, PCI_PRODUCT_CONTAQ_82C599,

- "82C599 PCI-VLB",

+ "82C599 VLB",

{

PCI_VENDOR_CONTAQ, PCI_PRODUCT_CONTAQ_82C693,

- "CY82C693U PCI-ISA",

+ "CY82C693U ISA",

{

PCI_VENDOR_COROLLARY, PCI_PRODUCT_COROLLARY_CBUSII_PCIB,

@@ -2052,7 +2052,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_CYCLONE, PCI_PRODUCT_CYCLONE_PCI_700,

- "IQ80310 (PCI-700)",

+ "IQ80310",

{

PCI_VENDOR_CYRIX, PCI_PRODUCT_CYRIX_GXMPCI,

@@ -2060,11 +2060,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_CYRIX, PCI_PRODUCT_CYRIX_GXMISA,

- "GXm PCI-ISA",

+ "GXm ISA",

{

PCI_VENDOR_CYRIX, PCI_PRODUCT_CYRIX_CX5530_PCIB,

- "Cx5530 South Bridge",

+ "Cx5530 South",

{

PCI_VENDOR_CYRIX, PCI_PRODUCT_CYRIX_CX5530_SMI,

@@ -2264,7 +2264,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_DPT, PCI_PRODUCT_DPT_I960_PPB,

- "PCI-PCI bridge",

+ "PCI-PCI",

{

PCI_VENDOR_DPT, PCI_PRODUCT_DPT_RAID_I2O,

@@ -2276,7 +2276,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_DPT, PCI_PRODUCT_DPT_MEMCTLR,

- "Memory Controller",

+ "Memory Control",

{

PCI_VENDOR_DOLPHIN, PCI_PRODUCT_DOLPHIN_PCISCI,

@@ -2284,7 +2284,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_DTCTECH, PCI_PRODUCT_DTCTECH_DMX3194U,

- "DMX3194U SCSI",

+ "DMX3194U",

{

PCI_VENDOR_DYNALINK, PCI_PRODUCT_DYNALINK_IS64PH,

@@ -2340,7 +2340,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ENE, PCI_PRODUCT_ENE_CB1410,

- "CB-1410 PCI-CardBus",

+ "CB-1410 CardBus",

{

PCI_VENDOR_ENSONIQ, PCI_PRODUCT_ENSONIQ_AUDIOPCI97,

@@ -2412,7 +2412,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ES, PCI_PRODUCT_ES_FREEDOM,

- "Freedom PCI-GBus",

+ "Freedom GBus",

{

PCI_VENDOR_EUMITCOM, PCI_PRODUCT_EUMITCOM_WL11000P,

@@ -2568,7 +2568,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_IBM, PCI_PRODUCT_IBM_GXT150P,

- "GXT-150P 2D Accelerator",

+ "GXT-150P",

{

PCI_VENDOR_IBM, PCI_PRODUCT_IBM_82G2675,

@@ -2604,7 +2604,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_IBM, PCI_PRODUCT_IBM_PCIX,

- "PCI-X to PCI-X",

+ "PCIX-PCIX",

{

PCI_VENDOR_IDT, PCI_PRODUCT_IDT_77201,

@@ -2616,23 +2616,23 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INITIO, PCI_PRODUCT_INITIO_INIC850,

- "INIC-850 (A100UW) SCSI",

+ "INIC-850 (A100UW)",

{

PCI_VENDOR_INITIO, PCI_PRODUCT_INITIO_INIC1060,

- "INIC-1060 (A100U2W) SCSI",

+ "INIC-1060 (A100U2W)",

{

PCI_VENDOR_INITIO, PCI_PRODUCT_INITIO_INIC940,

- "INIC-940 SCSI",

+ "INIC-940",

{

PCI_VENDOR_INITIO, PCI_PRODUCT_INITIO_INIC941,

- "INIC-941 SCSI",

+ "INIC-941",

{

PCI_VENDOR_INITIO, PCI_PRODUCT_INITIO_INIC950,

- "INIC-950 SCSI",

+ "INIC-950",

{

PCI_VENDOR_IMS, PCI_PRODUCT_IMS_8849,

@@ -2648,11 +2648,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80312,

- "80312 I/O Companion Chip",

+ "80312 I/O Companion",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCEB,

- "82375EB PCI-EISA",

+ "82375EB EISA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CDC,

@@ -2660,11 +2660,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_SIO,

- "82378IB PCI-ISA",

+ "82378IB ISA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82426EX,

- "82426EX PCI-to-ISA",

+ "82426EX ISA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCMC,

@@ -2964,7 +2964,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371FB_ISA,

- "82371FB PCI-ISA",

+ "82371FB ISA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371FB_IDE,

@@ -2972,7 +2972,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371MX,

- "82371 PCI-ISA and IDE",

+ "82371 ISA and IDE",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437MX,

@@ -2984,7 +2984,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82380AB,

- "82380AB Mobile PCI-ISA",

+ "82380AB Mobile ISA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82380FB,

@@ -3008,7 +3008,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82870P2_HPLUG,

- "P64H2 Hot Plug Controller",

+ "P64H2 Hot Plug",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RP_ATU,

@@ -3344,19 +3344,19 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_IO_1,

- "82865G/PE/P CPU to I/0 Bridge 1",

+ "82865G/PE/P CPU-I/0-1",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_AGP,

- "82865G/PE/P CPU to AGP Bridge",

+ "82865G/PE/P CPU-AGP",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_CSA,

- "82865G/PE/P CPU to CSA Bridge",

+ "82865G/PE/P CPU-CSA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_IO_2,

- "82865G/PE/P CPU to I/0 Bridge 2",

+ "82865G/PE/P CPU-I/0-2",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82875P_HB,

@@ -3364,7 +3364,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82875P_AGP,

- "82875P PCI-AGP",

+ "82875P AGP",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82875P_CSA,

@@ -3376,11 +3376,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_IO_1,

- "82830MP CPU to I/O Bridge 1",

+ "82830MP CPU-I/O-1",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_AGP,

- "82830MP CPU to AGP Bridge",

+ "82830MP CPU-AGP",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_IV,

@@ -3388,11 +3388,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82830MP_IO_2,

- "82830MP CPU to I/O Bridge 2",

+ "82830MP CPU-I/O-2",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852GM_HPB,

- "82852GM Hub-to-PCI",

+ "82852GM Hub-PCI",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82852GM_AGP,

@@ -3408,7 +3408,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855PE,

- "82855PE Host-Hub Bridge",

+ "82855PE Host-Hub",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855PE_AGP,

@@ -3424,7 +3424,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371SB_ISA,

- "82371SB PCI-ISA",

+ "82371SB ISA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371SB_IDE,

@@ -3484,7 +3484,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443LX,

- "82443LX PCI-AGP",

+ "82443LX AGP",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443LX_AGP,

@@ -3492,7 +3492,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443BX,

- "82443BX PCI-AGP",

+ "82443BX AGP",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443BX_AGP,

@@ -3516,7 +3516,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX_ISA,

- "82440MX PCI-ISA",

+ "82440MX ISA",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX_IDE,

@@ -3532,7 +3532,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440BX,

- "82440BX PCI-AGP",

+ "82440BX AGP",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440BX_AGP,

@@ -3572,7 +3572,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I2OPCIB,

- "I2O RAID PCI to PCI Bridge",

+ "I2O RAID PCI-PCI",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RCU21,

@@ -3912,11 +3912,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_164CB,

- "16/4 Cardbus Adapter",

+ "16/4 Cardbus",

{

PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_PRESTO,

- "Presto PCI Adapter",

+ "Presto PCI",

{

PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_SMARTHSRN100,

@@ -3928,15 +3928,15 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_164CB2,

- "16/4 CardBus Adapter Mk2",

+ "16/4 CardBus Mk2",

{

PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_COLLAGE25,

- "Collage 25 ATM adapter",

+ "Collage 25 ATM",

{

PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_COLLAGE155,

- "Collage 155 ATM adapter",

+ "Collage 155 ATM",

{

PCI_VENDOR_MARTINMARIETTA, PCI_PRODUCT_MARTINMARIETTA_I740,

@@ -4032,7 +4032,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_MOT, PCI_PRODUCT_MOT_MPC105,

- "MPC105 PCI bridge",

+ "MPC105 PCI",

{

PCI_VENDOR_MOT, PCI_PRODUCT_MOT_MPC106,

@@ -4564,7 +4564,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_ISA,

- "nForce2 PCI-ISA",

+ "nForce2 ISA",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_SMB,

@@ -4748,7 +4748,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_ISA,

- "nForce PCI-ISA",

+ "nForce ISA",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_SMB,

@@ -4756,7 +4756,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_AGP,

- "nForce PCI-AGP",

+ "nForce AGP",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_PPB,

@@ -4872,7 +4872,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C558,

- "82C558 PCI-ISA",

+ "82C558 ISA",

{

PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C568,

@@ -5056,7 +5056,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB5BRIDGE,

- "CSB5 PCI Bridge",

+ "CSB5 PCI",

{

PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6_LPC,

@@ -5064,7 +5064,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_RCC, PCI_PRODUCT_RCC_ISA,

- "PCI/ISA Bridge",

+ "PCI/ISA",

{

PCI_VENDOR_PICOPOWER, PCI_PRODUCT_PICOPOWER_PT80C826,

@@ -5276,39 +5276,39 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C465,

- "5C465 PCI-CardBus",

+ "5C465 CardBus",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C466,

- "5C466 PCI-CardBus",

+ "5C466 CardBus",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C475,

- "5C475 PCI-CardBus",

+ "5C475 CardBus",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C476,

- "5C476 PCI-CardBus",

+ "5C476 CardBus",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C477,

- "5C477 PCI-CardBus",

+ "5C477 CardBus",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RF5C478,

- "5C478 PCI-CardBus",

+ "5C478 CardBus",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_R5C521,

- "5C521 PCI-Firewire",

+ "5C521 Firewire",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_R5C551,

- "5C551 PCI-Firewire",

+ "5C551 Firewire",

{

PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_RL5C552,

- "5C552 PCI-Firewire",

+ "5C552 Firewire",

{

PCI_VENDOR_ROCKWELL, PCI_PRODUCT_ROCKWELL_RS56SP_PCI11P1,

@@ -5532,15 +5532,15 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_SIS, PCI_PRODUCT_SIS_85C503,

- "85C503 PCI System I/O Chipset",

+ "85C503 System",

{

PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5595,

- "5595 PCI System I/O Chipset",

+ "5595 System",

{

PCI_VENDOR_SIS, PCI_PRODUCT_SIS_85C503_ISA,

- "85C503 PCI-ISA",

+ "85C503 ISA",

{

PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5597VGA,

@@ -5876,7 +5876,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_SUN, PCI_PRODUCT_SUN_ERINETWORK,

- "ERI Ethernet",

+ "ERI Ether",

{

PCI_VENDOR_SUN, PCI_PRODUCT_SUN_FIREWIRE,

@@ -5920,7 +5920,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_SUN, PCI_PRODUCT_SUN_CE,

- "Cassini Ethernet",

+ "Cassini Ether",

{

PCI_VENDOR_SUNDANCE, PCI_PRODUCT_SUNDANCE_ST201,

@@ -5928,7 +5928,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_SUNDANCE, PCI_PRODUCT_SUNDANCE_ST2021,

- "ST2021 Gigabit Ethernet",

+ "ST2021",

{

PCI_VENDOR_SUNIX, PCI_PRODUCT_SUNIX_40XX,

@@ -5968,7 +5968,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_SYMPHONY, PCI_PRODUCT_SYMPHONY_82C565,

- "82C565 PCI-ISA",

+ "82C565 ISA",

{

PCI_VENDOR_TAMARACK, PCI_PRODUCT_TAMARACK_TC9021,

@@ -6060,47 +6060,47 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1130,

- "PCI1130 PCI-CardBus",

+ "PCI1130 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1031,

- "PCI1031 PCI-pcmcia",

+ "PCI1031 pcmcia",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1131,

- "PCI1131 PCI-CardBus",

+ "PCI1131 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1250,

- "PCI1250 PCI-CardBus",

+ "PCI1250 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1220,

- "PCI1220 PCI-CardBus",

+ "PCI1220 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1221,

- "PCI1221 PCI-CardBus",

+ "PCI1221 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1450,

- "PCI1450 PCI-CardBus",

+ "PCI1450 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1225,

- "PCI1225 PCI-CardBus",

+ "PCI1225 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1251,

- "PCI1251 PCI-CardBus",

+ "PCI1251 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1211,

- "PCI1211 PCI-CardBus",

+ "PCI1211 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1251B,

- "PCI1251B PCI-CardBus",

+ "PCI1251B CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI2030,

@@ -6112,43 +6112,43 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4451_CB,

- "PCI4451 PCI-CardBus",

+ "PCI4451 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4510,

- "PCI4510 PCI-CardBus",

+ "PCI4510 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4520,

- "PCI4520 PCI-CardBus",

+ "PCI4520 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1410,

- "PCI1410 PCI-CardBus",

+ "PCI1410 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1420,

- "PCI1420 PCI-CardBus",

+ "PCI1420 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1451,

- "PCI1451 PCI-CardBus",

+ "PCI1451 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1421,

- "PCI1421 PCI-CardBus",

+ "PCI1421 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1520,

- "PCI1520 PCI-CardBus",

+ "PCI1520 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1510,

- "PCI1510 PCI-CardBus",

+ "PCI1510 CardBus",

{

PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI2040,

- "PCI2040 PCI-DSP",

+ "PCI2040 DSP",

{

PCI_VENDOR_TIGERJET, PCI_PRODUCT_TIGERJET_TIGER320,

@@ -6176,7 +6176,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ISA,

- "PCI-ISA",

+ "ISA",

{

PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95,

@@ -6184,15 +6184,15 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95B,

- "ToPIC95B PCI-CardBus",

+ "ToPIC95B CardBus",

{

PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC97,

- "ToPIC97 PCI-CardBus",

+ "ToPIC97 CardBus",

{

PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC100,

- "ToPIC100 PCI-CardBus",

+ "ToPIC100 CardBus",

{

PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TFIRO,

@@ -6364,7 +6364,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM82C881,

- "UM82C881 486 Chipset",

+ "UM82C881 486",

{

PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM82C886,

@@ -6400,11 +6400,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8881F,

- "UM8881F PCI-Host",

+ "UM8881F Host",

{

PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8886F,

- "UM8886F PCI-ISA",

+ "UM8886F ISA",

{

PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8886A,

@@ -6420,7 +6420,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8886E_OR_WHAT,

- "PCI-ISA",

+ "ISA",

{

PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8886N,

@@ -6488,11 +6488,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C585,

- "VT82C585 PCI-ISA",

+ "VT82C585 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586_ISA,

- "VT82C586 PCI-ISA",

+ "VT82C586 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C595,

@@ -6500,7 +6500,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C596A,

- "VT82C596A PCI-ISA",

+ "VT82C596A ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597PCI,

@@ -6520,7 +6520,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_ISA,

- "VT82C686 PCI-ISA",

+ "VT82C686 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C691,

@@ -6540,7 +6540,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570MV,

- "VT82C570M PCI-ISA",

+ "VT82C570M ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C416,

@@ -6592,7 +6592,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8366_ISA,

- "VT8366 PCI-ISA",

+ "VT8366 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8366,

@@ -6620,7 +6620,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8233_ISA,

- "VT8233 PCI-ISA",

+ "VT8233 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8751,

@@ -6632,7 +6632,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8235_ISA,

- "VT8235 PCI-ISA",

+ "VT8235 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8377,

@@ -6640,7 +6640,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237_ISA,

- "VT8237 PCI-ISA",

+ "VT8237 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINEII,

@@ -6648,7 +6648,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8231_ISA,

- "VT8231 PCI-ISA",

+ "VT8231 ISA",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8231_PWR,

@@ -6656,7 +6656,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8363_AGP,

- "VT8363 PCI-AGP",

+ "VT8363 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8371_PPB,

@@ -6664,39 +6664,39 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8501_AGP,

- "VT8501 PCI-AGP",

+ "VT8501 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C601,

- "VT82C601 PCI-AGP",

+ "VT82C601 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597AGP,

- "VT82C597 PCI-AGP",

+ "VT82C597 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C598AGP,

- "VT82C598 PCI-AGP",

+ "VT82C598 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8605_AGP,

- "VT8605 PCI-AGP",

+ "VT8605 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8633_AGP,

- "VT8633 PCI-AGP",

+ "VT8633 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8366_AGP,

- "VT8366 PCI-AGP",

+ "VT8366 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8235_AGP,

- "VT8235 PCI-AGP",

+ "VT8235 AGP",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8377_AGP,

- "VT8377 PCI-AGP",

+ "VT8377 AGP",

{

PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_60x0,

@@ -7084,15 +7084,15 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W83C553F_0,

- "W83C553F PCI-ISA Bridge",

+ "W83C553F ISA",

{

PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W83C553F_1,

- "W83C553F IDE Controller",

+ "W83C553F",

{

PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W89C940F_1,

- "W89C940F Ethernet",

+ "W89C940F",

{

PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W6692,

@@ -7112,7 +7112,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MPCI_MODEM,

- "MiniPCI Modem",

+ "Modem",

{

PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF724,

@@ -7204,7 +7204,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_VLSI,

- "VLSI Technology",

+ "VLSI",

{

PCI_VENDOR_AVANCE,

@@ -7296,7 +7296,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_ASUSTEK,

- "Asustek Computer",

+ "Asustek",

{

PCI_VENDOR_DPT,

@@ -7356,7 +7356,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_PICOPOWER,

- "Picopower Technology",

+ "Picopower",

{

PCI_VENDOR_MYLEX,

@@ -7396,7 +7396,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_BIT3,

- "Bit3 Computer Corp.",

+ "Bit3",

{

PCI_VENDOR_OLICOM,

@@ -7444,7 +7444,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_PLX,

- "PLX Technology",

+ "PLX",

{

PCI_VENDOR_MADGE,

@@ -7468,7 +7468,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_SURECOM,

- "Surecom Technology",

+ "Surecom",

{

PCI_VENDOR_NEOMAGIC,

@@ -7508,7 +7508,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_TEKRAM,

- "Tekram Technology (1st ID)",

+ "Tekram (1st ID)",

{

PCI_VENDOR_NEWBRIDGE,

@@ -7556,7 +7556,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_ACCTON,

- "Accton Technology",

+ "Accton",

{

PCI_VENDOR_VORTEX,

@@ -7840,7 +7840,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_ASKEY,

- "Askey Computer Corp.",

+ "Askey",

{

PCI_VENDOR_AVERMEDIA,

@@ -7880,7 +7880,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_ENE,

- "ENE Technology",

+ "ENE",

{

PCI_VENDOR_TERRATEC,

@@ -7952,7 +7952,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {

{

PCI_VENDOR_TEKRAM2,

- "Tekram Technology",

+ "Tekram",

{

PCI_VENDOR_HINT,