diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 74e825d04691..09ae322e2b75 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.87 1998/09/18 04:30:52 mark Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.88 1998/09/18 10:51:15 drochner Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.80 1998/09/18 04:30:10 mark Exp 
+ *	NetBSD: pcidevs,v 1.81 1998/09/18 10:49:11 drochner Exp 
  */
 
 /*
@@ -270,7 +270,7 @@
 #define	PCI_VENDOR_IMS	0x10e0		/* Integrated Micro Solutions */
 #define	PCI_VENDOR_TEKRAM	0x10e1		/* Tekram Technology (1st PCI Vendor ID) */
 #define	PCI_VENDOR_APTIX	0x10e2		/* Aptix Corporation */
-#define	PCI_VENDOR_NEWBRIDGE	0x10e3		/* Newbridge Microsystems */
+#define	PCI_VENDOR_NEWBRIDGE	0x10e3		/* Newbridge Microsystems / Tundra Semiconductor */
 #define	PCI_VENDOR_TANDEM	0x10e4		/* Tandem Computers */
 #define	PCI_VENDOR_MICROINDUSTRIES	0x10e5		/* Micro Industries */
 #define	PCI_VENDOR_GAINBERY	0x10e6		/* Gainbery Computer Products */
@@ -522,6 +522,7 @@
 #define	PCI_VENDOR_COMPUTONE	0x8e0e		/* Computone Corperation */
 #define	PCI_VENDOR_KTI	0x8e2e		/* KTI */
 #define	PCI_VENDOR_ADP	0x9004		/* Adaptec */
+#define	PCI_VENDOR_ADP2	0x9005		/* Adaptec (2nd PCI Vendor ID) */
 #define	PCI_VENDOR_ATRONICS	0x907f		/* Atronics */
 #define	PCI_VENDOR_ARC	0xedd8		/* ARC Logic */
 #define	PCI_VENDOR_INVALID	0xffff		/* INVALID VENDOR ID */
@@ -590,6 +591,11 @@
 #define	PCI_PRODUCT_ADP_3940U	0x8278		/* AHA-3940 Ultra */
 #define	PCI_PRODUCT_ADP_2944U	0x8478		/* AHA-2944 Ultra */
 
+#define	PCI_PRODUCT_ADP2_2940U2	0x0010		/* AHA-2940 Ultra2 */
+#define	PCI_PRODUCT_ADP2_7890	0x001f		/* AIC-7890/1 */
+#define	PCI_PRODUCT_ADP2_3940U2	0x0050		/* AHA-3940 Ultra2 */
+#define	PCI_PRODUCT_ADP2_7896	0x005f		/* AIC-7896/7 */
+
 /* Advanced System Products */
 #define	PCI_PRODUCT_ADVSYS_1200A	0x1100	
 #define	PCI_PRODUCT_ADVSYS_1200B	0x1200	
@@ -636,6 +642,7 @@
 
 /* Bit3 products */
 #define	PCI_PRODUCT_BIT3_PCIVME617	0x0001		/* PCI-VME Interface Mod. 617 */
+#define	PCI_PRODUCT_BIT3_PCIVME2706	0x0300		/* PCI-VME Interface Mod. 2706 */
 
 /* Brooktree products */
 #define	PCI_PRODUCT_BROOKTREE_BT848	0x0350		/* Bt848 Video Capture */
@@ -875,6 +882,9 @@
 /* NetVin products - XXX better descriptions */
 #define	PCI_PRODUCT_NETVIN_5000	0x5000		/* 5000 Ethernet */
 
+/* Newbridge / Tundra products */
+#define	PCI_PRODUCT_NEWBRIDGE_CA91CX42	0x0000		/* Universe VME bridge */
+
 /* National Semiconductor products */
 #define	PCI_PRODUCT_NS_DP83810	0x0001		/* DP83810 10/100 Ethernet */
 #define	PCI_PRODUCT_NS_NS87410	0xd001		/* NS87410 */
@@ -888,12 +898,12 @@
 #define	PCI_PRODUCT_SYMBIOS_860	0x0006		/* 53c860 */
 #define	PCI_PRODUCT_SYMBIOS_875	0x000f		/* 53c875 */
 
-/* NEC products */
-#define	PCI_PRODUCT_NEC_POWERVR2	0x0046		/* PowerVR PCX2 */
-
 /* Packet Engines products */
 #define	PCI_PRODUCT_SYMBIOS_PE_GNIC	0x0702		/* Packet Engines G-NIC Ethernet */
 
+/* NEC products */
+#define	PCI_PRODUCT_NEC_POWERVR2	0x0046		/* PowerVR PCX2 */
+
 /* NexGen products */
 #define	PCI_PRODUCT_NEXGEN_NX82C501	0x4e78		/* NX82C501 Host-PCI Bridge */
 
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 8d7ce3c80861..baf018ba9b4a 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.86 1998/09/18 04:30:52 mark Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.87 1998/09/18 10:51:16 drochner Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.80 1998/09/18 04:30:10 mark Exp 
+ *	NetBSD: pcidevs,v 1.81 1998/09/18 10:49:11 drochner Exp 
  */
 
 /*
@@ -315,6 +315,30 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Adaptec",
 	    "AHA-2944 Ultra",
 	},
+	{
+	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_2940U2,
+	    0,
+	    "Adaptec (2nd PCI Vendor ID)",
+	    "AHA-2940 Ultra2",
+	},
+	{
+	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_7890,
+	    0,
+	    "Adaptec (2nd PCI Vendor ID)",
+	    "AIC-7890/1",
+	},
+	{
+	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3940U2,
+	    0,
+	    "Adaptec (2nd PCI Vendor ID)",
+	    "AHA-3940 Ultra2",
+	},
+	{
+	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_7896,
+	    0,
+	    "Adaptec (2nd PCI Vendor ID)",
+	    "AIC-7896/7",
+	},
 	{
 	    PCI_VENDOR_ADVSYS, PCI_PRODUCT_ADVSYS_1200A,
 	    0,
@@ -477,6 +501,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Bit3 Computer Corp.",
 	    "PCI-VME Interface Mod. 617",
 	},
+	{
+	    PCI_VENDOR_BIT3, PCI_PRODUCT_BIT3_PCIVME2706,
+	    0,
+	    "Bit3 Computer Corp.",
+	    "PCI-VME Interface Mod. 2706",
+	},
 	{
 	    PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT848,
 	    0,
@@ -1401,6 +1431,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "NetVin",
 	    "5000 Ethernet",
 	},
+	{
+	    PCI_VENDOR_NEWBRIDGE, PCI_PRODUCT_NEWBRIDGE_CA91CX42,
+	    0,
+	    "Newbridge Microsystems / Tundra Semiconductor",
+	    "Universe VME bridge",
+	},
 	{
 	    PCI_VENDOR_NS, PCI_PRODUCT_NS_DP83810,
 	    0,
@@ -1455,18 +1491,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Symbios Logic",
 	    "53c875",
 	},
-	{
-	    PCI_VENDOR_NEC, PCI_PRODUCT_NEC_POWERVR2,
-	    0,
-	    "NEC",
-	    "PowerVR PCX2",
-	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_PE_GNIC,
 	    0,
 	    "Symbios Logic",
 	    "Packet Engines G-NIC Ethernet",
 	},
+	{
+	    PCI_VENDOR_NEC, PCI_PRODUCT_NEC_POWERVR2,
+	    0,
+	    "NEC",
+	    "PowerVR PCX2",
+	},
 	{
 	    PCI_VENDOR_NEXGEN, PCI_PRODUCT_NEXGEN_NX82C501,
 	    0,
@@ -3696,7 +3732,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_NEWBRIDGE, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Newbridge Microsystems",
+	    "Newbridge Microsystems / Tundra Semiconductor",
 	    NULL,
 	},
 	{
@@ -5205,6 +5241,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Adaptec",
 	    NULL,
 	},
+	{
+	    PCI_VENDOR_ADP2, 0,
+	    PCI_KNOWNDEV_NOPROD,
+	    "Adaptec (2nd PCI Vendor ID)",
+	    NULL,
+	},
 	{
 	    PCI_VENDOR_ATRONICS, 0,
 	    PCI_KNOWNDEV_NOPROD,