sync

2 files changed, 34 insertions, 34 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index d6061188a4e..fdf27317065 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.86 1998/09/26 04:17:49 downsj Exp 
+ *	OpenBSD: pcidevs,v 1.87 1998/09/26 22:35:26 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -64,16 +64,16 @@
 #define	PCI_VENDOR_AST	0x100d		/* AST Research */
 #define	PCI_VENDOR_WEITEK	0x100e		/* Weitek */
 #define	PCI_VENDOR_VIDEOLOGIC	0x1010		/* Video Logic */
-#define	PCI_VENDOR_DEC	0x1011		/* Digital Equipment */
+#define	PCI_VENDOR_DEC	0x1011		/* DEC */
 #define	PCI_VENDOR_MICRONICS	0x1012		/* Micronics Computers */
 #define	PCI_VENDOR_CIRRUS	0x1013		/* Cirrus Logic */
 #define	PCI_VENDOR_IBM	0x1014		/* IBM */
-#define	PCI_VENDOR_LSIL	0x1015		/* LSI Logic Corp of Canada */
+#define	PCI_VENDOR_LSIL	0x1015		/* LSI Canada */
 #define	PCI_VENDOR_ICLPERSONAL	0x1016		/* ICL Personal Systems */
 #define	PCI_VENDOR_SPEA	0x1017		/* SPEA Software */
 #define	PCI_VENDOR_UNISYS	0x1018		/* Unisys Systems */
 #define	PCI_VENDOR_ELITEGROUP	0x1019		/* Elitegroup Computer Systems */
-#define	PCI_VENDOR_NCR	0x101a		/* AT&T Global Information Systems */
+#define	PCI_VENDOR_NCR	0x101a		/* AT&T GIS */
 #define	PCI_VENDOR_VITESSE	0x101b		/* Vitesse Semiconductor */
 #define	PCI_VENDOR_WD	0x101c		/* Western Digital */
 #define	PCI_VENDOR_AMI	0x101e		/* American Megatrends */
@@ -86,11 +86,11 @@
 #define	PCI_VENDOR_ACER	0x1025		/* Acer */
 #define	PCI_VENDOR_DELL	0x1028		/* Dell Computer */
 #define	PCI_VENDOR_SNI	0x1029		/* Siemens Nixdorf AG */
-#define	PCI_VENDOR_LSILOGIC	0x102a		/* LSI Logic, Headland div. */
+#define	PCI_VENDOR_LSILOGIC	0x102a		/* LSI Logic */
 #define	PCI_VENDOR_MATROX	0x102b		/* Matrox */
 #define	PCI_VENDOR_CHIPS	0x102c		/* Chips and Technologies */
 #define	PCI_VENDOR_WYSE	0x102d		/* WYSE Technology */
-#define	PCI_VENDOR_OLIVETTI	0x102e		/* Olivetti Advanced Technology */
+#define	PCI_VENDOR_OLIVETTI	0x102e		/* Olivetti */
 #define	PCI_VENDOR_TOSHIBA	0x102f		/* Toshiba America */
 #define	PCI_VENDOR_TMCRESEARCH	0x1030		/* TMC Research */
 #define	PCI_VENDOR_MIRO	0x1031		/* Miro Computer Products */
@@ -135,7 +135,7 @@
 #define	PCI_VENDOR_PROMISE	0x105a		/* Promise Technology */
 #define	PCI_VENDOR_FOXCONN	0x105b		/* Foxconn International */
 #define	PCI_VENDOR_WIPRO	0x105c		/* Wipro Infotech */
-#define	PCI_VENDOR_NUMBER9	0x105d		/* Number 9 Computer Company */
+#define	PCI_VENDOR_NUMBER9	0x105d		/* Number 9 */
 #define	PCI_VENDOR_VTECH	0x105e		/* Vtech Computers */
 #define	PCI_VENDOR_INFOTRONIC	0x105f		/* Infotronic America */
 #define	PCI_VENDOR_UMC	0x1060		/* United Microelectronics */
@@ -216,7 +216,7 @@
 #define	PCI_VENDOR_HONEYWELL	0x10ac		/* Honeywell IASD */
 #define	PCI_VENDOR_SYMPHONY	0x10ad		/* Symphony Labs */
 #define	PCI_VENDOR_CORNERSTONE	0x10ae		/* Cornerstone Technology */
-#define	PCI_VENDOR_MICROCOMPSON	0x10af		/* Micro Computer Sysytems (M) SON */
+#define	PCI_VENDOR_MICROCOMPSON	0x10af		/* Micro Computer Systems (M) SON */
 #define	PCI_VENDOR_CARDEXPER	0x10b0		/* CardExpert Technology */
 #define	PCI_VENDOR_CABLETRON	0x10B1		/* Cabletron Systems */
 #define	PCI_VENDOR_RAYETHON	0x10b2		/* Raytheon */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 8d893f47d09..a300043ca87 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.86 1998/09/26 04:17:49 downsj Exp 
+ *	OpenBSD: pcidevs,v 1.87 1998/09/26 22:35:26 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -905,97 +905,97 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21050,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21050 PCI-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21040,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21040 (Tulip)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21030,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21030 (TGA)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_NVRAM,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "Zephyr NV-RAM",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_KZPSA,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "KZPSA",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21140,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21140 (FasterNet)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_PBXGB,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "TGA2",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DEFPA,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DEFPA",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21041,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21041 (Tulip Pass 3)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DGLPB,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DGLPB (OPPO)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21142,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21142/3",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21052,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21052 PCI-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21150,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21150 PCI-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21152,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21152 PCI-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21153,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21153 PCI-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21154,
 	    0,
-	    "Digital Equipment",
+	    "DEC",
 	    "DECchip 21154 PCI-PCI Bridge",
 	},
 	{
@@ -1619,13 +1619,13 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_NUMBER9, PCI_PRODUCT_NUMBER9_I128,
 	    0,
-	    "Number 9 Computer Company",
+	    "Number 9",
 	    "Imagine-128",
 	},
 	{
 	    PCI_VENDOR_NUMBER9, PCI_PRODUCT_NUMBER9_I128_2,
 	    0,
-	    "Number 9 Computer Company",
+	    "Number 9",
 	    "Imagine-128 II",
 	},
 	{
@@ -2723,7 +2723,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_DEC, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Digital Equipment",
+	    "DEC",
 	    NULL,
 	},
 	{
@@ -2747,7 +2747,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_LSIL, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "LSI Logic Corp of Canada",
+	    "LSI Canada",
 	    NULL,
 	},
 	{
@@ -2777,7 +2777,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_NCR, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "AT&T Global Information Systems",
+	    "AT&T GIS",
 	    NULL,
 	},
 	{
@@ -2855,7 +2855,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_LSILOGIC, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "LSI Logic, Headland div.",
+	    "LSI Logic",
 	    NULL,
 	},
 	{
@@ -2879,7 +2879,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_OLIVETTI, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Olivetti Advanced Technology",
+	    "Olivetti",
 	    NULL,
 	},
 	{
@@ -3149,7 +3149,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_NUMBER9, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Number 9 Computer Company",
+	    "Number 9",
 	    NULL,
 	},
 	{
@@ -3635,7 +3635,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_MICROCOMPSON, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Micro Computer Sysytems (M) SON",
+	    "Micro Computer Systems (M) SON",
 	    NULL,
 	},
 	{