sync

1 files changed, 25 insertions, 1873 deletions

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 56677e00206..5da74ca92c1 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.73 1998/07/21 21:56:17 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.74 1998/07/23 08:45:34 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -71,13 +71,13 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO,
 	    0,
-	    "3DFX Interactive Inc",
+	    "3DFX Interactive",
 	    "Voodoo",
 	},
 	{
 	    PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO2,
 	    0,
-	    "3DFX Interactive Inc",
+	    "3DFX Interactive",
 	    "Voodoo2",
 	},
 	{
@@ -723,16 +723,16 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Integrated NetFlex 3/P",
 	},
 	{
-	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DPNet100TX,
+	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_IntPL100TX,
 	    0,
 	    "Compaq",
-	    "Dual Port Netelligent 10/100 TX",
+	    "ProLiant Integrated Netelligent 10/100 TX",
 	},
 	{
-	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_IntPL100TX,
+	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DPNet100TX,
 	    0,
 	    "Compaq",
-	    "ProLiant Integrated Netelligent 10/100 TX",
+	    "Dual Port Netelligent 10/100 TX",
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DP4000,
@@ -1415,73 +1415,73 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_810,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c810",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_820,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c820",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_825,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c825",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_815,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c815",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_810AP,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c810AP",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_860,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c860",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_875,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c875",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_875J,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c875J",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_885,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c885",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_895,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c895",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_896,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "53c896",
 	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_PE_GNIC,
 	    0,
-	    "Symbios Logic Inc",
+	    "Symbios Logic",
 	    "Packet Engines G-NIC Ethernet",
 	},
 	{
@@ -2453,7 +2453,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_MARTINMARIETTA, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Lockheed Martin Corp",
+	    "Martin-Marietta",
 	    NULL,
 	},
 	{
@@ -2465,13 +2465,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_SYMBIOS, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Symbios Logic Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_KOLTER, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "KOLTER ELECTRONIC",
+	    "Symbios Logic",
 	    NULL,
 	},
 	{
@@ -4161,12 +4155,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_EDI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Excellent Design, Inc.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_LEUTRON, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Leutron Vision",
@@ -4209,12 +4197,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_ZENITH2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Zenith Data Systems (2nd ID)",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_RAVICAD, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Ravicad",
@@ -4299,12 +4281,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_NCD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Network Computing Devices",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_CYCLONE, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Cyclone Micro",
@@ -4497,12 +4473,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_PHOTRON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Photron Ltd.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_XIRCOM, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Xircom",
@@ -4593,18 +4563,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_INTRES, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Intelligent Resources",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_E4I, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Electronics for Imaging",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_WSTECH, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Workstation Technology",
@@ -4677,36 +4635,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_LGEI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "LG Electronics Inc.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_ATTO, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Atto Technology",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_BND, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Becton & Dickinson",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_TR, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "T/R Systems",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_ICS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Integrated Circuit Systems",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_RICOH, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Ricoh",
@@ -4767,12 +4707,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_HYPERTEC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Hypertec Pty Ltd",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_COROLLARY, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Corrollary",
@@ -4791,12 +4725,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_GREENLOGIC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Green Logic",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_ARTOP, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Artop Electric",
@@ -4905,12 +4833,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_DEURETZBACHER, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Deuretzbacher GmbH & Co. Eng. KG",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_BARCO, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Barco",
@@ -4935,12 +4857,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_SYSTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Systech Corp.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_INNOSYS, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "InnoSys",
@@ -4977,9 +4893,9 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_AVID, 0,
+	    PCI_VENDOR_PROLOG, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Avid Technology Inc.",
+	    "Pro-Log",
 	    NULL,
 	},
 	{
@@ -5073,30 +4989,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_ASTRODESIGN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Astrodesign Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HP2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Hewlett-Packard (2nd ID)",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ATT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "AT&T Microelectronics",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SAND, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sand Microelectronics",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_NEC2, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "NEC (2nd ID)",
@@ -5111,13 +5003,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_SHIVA, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Shiva Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DSMFG, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Dainippon Screen Mfg. Co",
+	    "Shiva",
 	    NULL,
 	},
 	{
@@ -5163,378 +5049,24 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_PRIMRATE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Primary Rate Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PIONEER, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Pioneer Electronic Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_LORAL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Loral Frederal Systems - Manassas",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AURAVISION, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "AuraVision Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_INTERCOM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Intercom Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TRANCELL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Trancell Systems Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ANALOGDEV, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Analog Devices",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_IKON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Ikon Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TEKELEC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Tekelec Technologies",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TRENTONTERM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Trenton Terminals Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ITD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Image Technologies Development",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TEC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Tec Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NOVELL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Novell",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SEGA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sega Enterprises Ltd",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_QUESTRA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Questra Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CROSSFIELD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Crosfield Electronics Ltd",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_ZORAN, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Zoran",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_NEWWAVE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "New Wave Pdg",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CRAYCOMM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Cray Communications A/S",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GPSI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Gec Plessey Semi Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SAMSUNGISA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Samsung Information Systems America",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_QUICKLOGIC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Quicklogic Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_2NDWAVE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Second Wave Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_IIXC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "IIX Consulting",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MZSR, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Mitsui-Zosen System Research",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TOSHIB3, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Toshiba America, Elec. Co (3rd ID)",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DPS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Digital Processing Systems Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HIGHWATER, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Highwater Designs Ltd",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ELSAGDAILEY, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Elsag Bailey",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_FORMATION, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Formation Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CORECO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Coreco Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MEDIAMATICS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Mediamatics",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DISYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Dome Imaging Systems Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NICOLETECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Nicolet Technologies BV",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COMPUSHACK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Compu-Shack GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SYMBIOS2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Symbios Logic Inc (2nd ID)",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PICTURETEL2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Picture Tel Japan KK (2nd ID)",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_KEITHLEY, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Keithley Metrabyte",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_KINETICSYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Kinetic Systems Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COMPDEVS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Computing Devices Intl",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_COMPEX, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Compex",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_SCIATLANTA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Scientific Atlanta",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_PMCSIERRA, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "PMC-Sierra",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_ICUBE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "I-Cube Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_KASAN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Kasan Electronics Co Ltd",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DATEL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Datel Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SILICONMAG, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Silicon Magic",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HIGHSTREET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "High Street Consultants",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COMTROL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Comtrol Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SCION, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Scion Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CSS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "CSS Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VISTA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Vista Controls Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NGC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Network General Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_BAYER, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Bayer Corporation, Agfa Div",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_LATTICE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Lattice Semiconductor Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ARRAY, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Array Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AMDAHL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Amdahl Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PARSYTEC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Parsytec GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SCISYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sci Systems Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SYNAPTEL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Synaptel",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ADAPSOL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Adaptive Solutions",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COMPRESLABS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Compression Labs, Inc.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_CYCLADES, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Cyclades",
@@ -5547,99 +5079,15 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_HPT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Hyperparallel Technologies",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_BRAINTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Braintech Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_KINGSTON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Kingston Technology Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AISI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Applied Intelligent Systems Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PTI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Performance Technologies Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_INTERWARE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Interware Co Ltd",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PURUP, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Purup Prepress A/S",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_2MICRO, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "2 Micro Inc",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_HYBRICON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Hybricon Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_1STVIRTUAL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "First Virtual Corporation",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_3DFX, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "3DFX Interactive Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ADM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Advanced Telecommunications Modules",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NIPPON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Nippon Texa Co Ltd",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_LIPPERT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Lippert Automationstechnik GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CSPI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "CSPI",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ARCUS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Arcus Technology Inc",
+	    "3DFX Interactive",
 	    NULL,
 	},
 	{
@@ -5649,480 +5097,36 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_CONTEC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Contec Co Ltd",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ANCOR, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Ancor Communications Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HEURIKON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Heurikon/Computer Products",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_IACTIMAGES, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Interactive Images",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_POWERIO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Power I/O Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TECHSRC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Tech-Source",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NEOAS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Norsk Elektro Optikk A/S",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DATAKINESIS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Data Kinesis Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_INTELECOM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Integrated Telecom",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_LGIS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "LG Industrial Systems Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SICAN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sican GmbH",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_AZTECH, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Aztech",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_XYRATEX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Xyratex",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ANDREW, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Andrew Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_FISHCAMP, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Fishcamp Engineering",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_WOODWARD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Woodward McCoach Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GPT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "GPT Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_BUSTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Bus-Tech Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TECHNICAL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Technical Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_RMSI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Risq Modular Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SIGMAD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sigma Designs Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ALTATECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Alta Technology Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ADTRAN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Adtran",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_3DO, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "The 3D0 Company",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_VBISICOM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Visicom Laboratories Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SEEQTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Seeq Technology Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CENTSYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Century Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_EDTI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Engineering Design Team Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CCUBE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "C-Cube Microsystems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MARATHONTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Marathon Technologies Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DSC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "DSC Communications",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DELPHAX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Delphax",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AVM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "AVM",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_APDSA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "APD S.A.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DIPIXTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Dipix Technologies Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_XYLON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Xylon Research Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CDC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Central Data Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SAMSUNG, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Samsung Electronics Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AEG, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "AEG Electrocom GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GREENSPRING, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "GreenSpring Computers",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SOLITRON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Solitron Technologies Inc.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_STALLION, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Stallion Technologies",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_CYLINK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Cylink",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_INFORTREND, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Infortrend Technology Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HITACHIMCSYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Hitachi Microcomputer System Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VLSISOL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "VLSI Solution OY",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GUZIK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Guzik Technical Enterprises",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_LINEARSYS, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Linear Systems",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_OPTIBASE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Optibase Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PSI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Perceptive Solutions Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VERTEXNET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Vertex Networks Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GILBARCO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Gilbarco Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ALLIEDTEL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Allied Telesyn International",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ABBPS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "ABB Power Systems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ASIX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Asix Electronics Corporation",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_AURORA, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Aurora Technologies",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_ESSTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "ESS Technology",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SESRL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Specialvideo Engineering SRL",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CTI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Concurrent Technologies Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HARRIS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Harris Semiconductor",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MATSISHITA3, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Matsushita-Kotobuki Electronics Industr",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ESC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "ES Computer Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SONIC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sonic Solutions",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AVAL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Aval Nagasaki Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CASIO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Casio Computer Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MICRODYNE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Microdyne Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SATC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "S.A. Telecommunications",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TEKTRONIX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Tektronix",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_THOMSON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Thomson-CSF/TTM",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_LEXMARK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Lexmark International Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ADAX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Adax Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NORTHTELCOM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Northern Telecom",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SPLASHTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Splash Technology Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SMI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sumitomo Metal Industries Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SILICONMOTION, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Silicon Motion",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_OLYMPUSOPT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Olympus Optical Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GWI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "GW Instruments",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TELEMATICS2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Telematics International (2nd ID)",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HNS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Hughes Network Systems",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_ENSONIQ, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Ensoniq",
@@ -6135,822 +5139,36 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_SNTI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Switched Network Technologies Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COMSTREAM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Comstream",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TPS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Transtech Parallel Systems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TRANSMETA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Transmeta Corporation",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_ROCKWELL, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Rockwell Semiconductor Systems",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_PIXERA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Pixera Corp",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_XPTSOLUTIONS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Crosspoint Solutions Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VELA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Vela Research",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_WINNOV, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Winnov, L.P.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_FUJIFILM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Fujifilm",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PSG, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Photoscript Group Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_YOKOGAWA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Yokogawa Electronic Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DAVICOM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Davicom Semiconductor Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ITE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Integrated Technology Express Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SAHARANET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sahara Networks Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PLATFORMTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Platform Technologies Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MAZET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Mazet GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_LUXSONOR, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "LuxSonor Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TIMESTEP, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Timestep Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AVCTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "AVC Technology Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ASANTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Asante Technologies Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TRANSWITCH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Transwitch Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_RETIX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Retix Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_G2NETS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "G2 Networks Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SAMHO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Samho Multi Tech Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TATENO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Tateno Dennou Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SORD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sord Computer Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NCS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "NCS Computer Italia",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_TRITECH, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "TriTech Microelectronics",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_MRT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Media Reality Technology",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_RHETORES, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Rhetorex Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_IMAGINATION, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Imagenation Corporation",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_KOFAX, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Kofax Image Products",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_HOLCO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Holco Enterprise",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SPELLCASTER, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Spellcaster Telecommunications Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_KTLABS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Knowledge Technology Laboratories",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VMETRO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "VMETRO",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_IMAGEACCESS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Image Access",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COMPCORE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "CompCore Multimedia Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_JVC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Victor Co. of Japan Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_OECMS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "OEC Medical Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ABC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Allen Bradley Co.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SIMPACT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Simpact Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NGS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "NewGen Systems Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_LUCENT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Lucent Technologies",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NTT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "NTT Electronics Technology Co.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VDLTD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Vision Dynamics Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SNETS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Scalable Networks Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AMO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "AMO GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NEWSDATACOM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "News Datacom",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_XIOTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Xiotech Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SDL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "SDL Communications Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_YYECO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Yuan Yuan Enterprise Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MEASUREX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "MeasureX Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MULTIDATA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Multidata GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ALTECON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "lteon Networks Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TDK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "TDK USA Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_JORGESCI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Jorge Scientific Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GAMMALINK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "GammaLink",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GSNET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "General Signal Networks",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_IFACE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Inter-Face Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_FUTURETEL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Future Tel Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GRANITESYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Granite Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NATURAL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Natural Microsystems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ACUMEN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Acumen",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_KORG, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Korg",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_USR, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "US Robotics",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_BITTWARE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Bittware Research Systems Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NIPPONUS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Nippon Unisoft Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ARRAYMSYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Array Microsystems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COMPUTERM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Computerm Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ANCHOR, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Anchor Chips Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_FUJIFILMMD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Fujifilm Microdevices",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_INFIMED, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Infimed",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GMM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "GMM Research Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MENTEC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Mentec Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HOLTEK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Holtek Microelectronics Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CONNECT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Connect Tech Inc.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_PICTUREEL, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Picture Elements",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_MITANI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Mitani Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DIALOGIC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Dialogic Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GFORCE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "G Force Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GIGIOP, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Gigi Operations",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ICE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Integrated Computing Engines, Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ANTEX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Antex Electronics Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PLUTO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Pluto Technologies International",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AIMS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Aims Lab",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NETSPEED, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Netspeed Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PROPHET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Prophet Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GDESYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "GDE Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PSITECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "PsiTech",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_STB2, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "STB (2nd ID)",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_VINGMED, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Vingmed Sound A/S",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DGMS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "DGM & S",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_EQUATOR, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Equator Technologies",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ANALOGIC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Analogic Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_BIOTRONIC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Biotronic SRL",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PERICOM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Pericom Semiconductor",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ACULAB, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Aculab Plc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TRUETIME, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "True Time",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ANNAPOLIS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Annapolis Micro Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SYMICRON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Symicron Computer Communication Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MGI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Management Graphics Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_RAINBOW, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Rainbow Technologies",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SBSTECH, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "SBS Technologies Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CHASE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Chase Research PLC",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_NINTENDO, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Nintendo Co. Ltd.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DATUM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Datum Inc., Bancomm-Timing Division",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_IMATION, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Imation Corp. - Medical Imaging Systems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_BROOKTROUT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Brooktrout Technology Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CIREL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Cirel Systems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SEBRING, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sebring Systems Inc",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CRISC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "CRISC Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GESN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "GE Spacenet",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ZUKEN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Zuken",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_AUREAL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Aureal Semiconductor",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_3AINT, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "3A International Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_OPTIVISION, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Optivision Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ORANGE, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Orange Micro",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VIENNA, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Vienna Systems",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PENTEK, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Pentek",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_SORENSON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Sorenson Vision Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_GGI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Gammagraphx Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_MEGATEL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Megatel",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_FORKS2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Forks (2nd ID)",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DAWSON, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Dawson France",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_COGNEX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Cognex",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_EDESIGN, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Electronic-Design GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_FOURFOLD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "FourFold Technologies",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ESD, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Electronic System Design GmbH",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_RADISYS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "RadiSys Corporation",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_VIDEOMAIL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Videomail Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ODETICS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Odetics",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_ABBNP, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "ABB Network Partner AB",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PATRIOTSCI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Patriot Scientific Corp.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CDI, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Concept Development Inc.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_SYMPHONY2, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Symphony Labs (2nd ID)",
@@ -6963,24 +5181,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_CHAINTECH2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "ChainTech Computer (2nd ID)",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_HANSOL, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Hansol Electronics Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_PIS, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Post Impressions Systems",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_3DLABS, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "3D Labs",
@@ -6993,18 +5193,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_COGETEC, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Cogetec Informatique Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_UMAX, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "UMAX Computer Corp.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_NETVIN, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "NetVin",
@@ -7023,18 +5211,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_TUB, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Technische Universtiaet Berlin",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_CNET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Cnet Technoliges, Inc.",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_NETPOWER2, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "NetPower (2nd ID)",
@@ -7065,12 +5241,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_SILICONMAG2, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Silicon Magic (2nd ID)",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_WINBOND2, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Winbond Electronics (2nd ID)",
@@ -7101,24 +5271,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_MOTIONENG, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Motion Engineering Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_DY4S, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "DY4 Systems Inc.",
-	    NULL,
-	},
-	{
-	    PCI_VENDOR_TIGERJET, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Tiger Jet Network Inc",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_ARC, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "ARC Logic",