sync

2 files changed, 24 insertions, 24 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 37630b3398e..f58f1ac3303 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.343 2000/11/07 23:51:43 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.344 2000/11/08 18:04:41 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -683,20 +683,20 @@
 #define	PCI_PRODUCT_ADP_AIC6915	0x6915		/* AIC-6915 */
 #define	PCI_PRODUCT_ADP_7895	0x7895		/* AIC-7895 */
 
-#define	PCI_PRODUCT_ADP2_2940U2	0x0010		/* AHA-2940U2 Ultra2 */
-#define	PCI_PRODUCT_ADP2_2930U2	0x0011		/* AHA-2930U2 Ultra2 */
-#define	PCI_PRODUCT_ADP2_AIC7890	0x001f		/* AIC-7890/1 Ultra2 */
-#define	PCI_PRODUCT_ADP2_AIC7892	0x008F		/* AIC-7892 Ultra160 */
-#define	PCI_PRODUCT_ADP2_29160	0x0080		/* AHA-29160 Ultra160 */
-#define	PCI_PRODUCT_ADP2_19160B	0x0081		/* AHA-19160B Ultra160 */
-#define	PCI_PRODUCT_ADP2_3950U2B	0x0050		/* AHA-3950U2B Ultra2 */
-#define	PCI_PRODUCT_ADP2_3950U2D	0x0051		/* AHA-3950U2D Ultra2 */
-#define	PCI_PRODUCT_ADP2_AIC7896	0x005f		/* AIC-7896/7 Ultra2 */
-#define	PCI_PRODUCT_ADP2_3960D	0x00c0		/* AHA-3960D Ultra160 */
+#define	PCI_PRODUCT_ADP2_2940U2	0x0010		/* AHA-2940U2 U2 */
+#define	PCI_PRODUCT_ADP2_2930U2	0x0011		/* AHA-2930U2 U2 */
+#define	PCI_PRODUCT_ADP2_AIC7890	0x001f		/* AIC-7890/1 U2 */
+#define	PCI_PRODUCT_ADP2_AIC7892	0x008F		/* AIC-7892 U60 */
+#define	PCI_PRODUCT_ADP2_29160	0x0080		/* AHA-29160 U160 */
+#define	PCI_PRODUCT_ADP2_19160B	0x0081		/* AHA-19160B U160 */
+#define	PCI_PRODUCT_ADP2_3950U2B	0x0050		/* AHA-3950U2B U2 */
+#define	PCI_PRODUCT_ADP2_3950U2D	0x0051		/* AHA-3950U2D U2 */
+#define	PCI_PRODUCT_ADP2_AIC7896	0x005f		/* AIC-7896/7 U2 */
+#define	PCI_PRODUCT_ADP2_3960D	0x00c0		/* AHA-3960D U160 */
 #define	PCI_PRODUCT_ADP2_AIC7899B	0x00c1		/* AIC-7899B */
 #define	PCI_PRODUCT_ADP2_AIC7899D	0x00c3		/* AIC-7899D */
 #define	PCI_PRODUCT_ADP2_AIC7899F	0x00c5		/* AIC-7899F */
-#define	PCI_PRODUCT_ADP2_AIC7899	0x00cf		/* AIC-7899 Ultra160 */
+#define	PCI_PRODUCT_ADP2_AIC7899	0x00cf		/* AIC-7899 U160 */
 #define	PCI_PRODUCT_ADP2_AAC2622	0x0282		/* AAC-2622 */
 #define	PCI_PRODUCT_ADP2_AAC364	0x0364		/* AAC-364 */
 #define	PCI_PRODUCT_ADP2_AAC3642	0x0365		/* AAC-3642 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 881448bd613..324597f7840 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.343 2000/11/07 23:51:43 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.344 2000/11/08 18:04:41 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -618,61 +618,61 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_2940U2,
 	    0,
 	    "Adaptec(2)",
-	    "AHA-2940U2 Ultra2",
+	    "AHA-2940U2 U2",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_2930U2,
 	    0,
 	    "Adaptec(2)",
-	    "AHA-2930U2 Ultra2",
+	    "AHA-2930U2 U2",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7890,
 	    0,
 	    "Adaptec(2)",
-	    "AIC-7890/1 Ultra2",
+	    "AIC-7890/1 U2",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7892,
 	    0,
 	    "Adaptec(2)",
-	    "AIC-7892 Ultra160",
+	    "AIC-7892 U60",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_29160,
 	    0,
 	    "Adaptec(2)",
-	    "AHA-29160 Ultra160",
+	    "AHA-29160 U160",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_19160B,
 	    0,
 	    "Adaptec(2)",
-	    "AHA-19160B Ultra160",
+	    "AHA-19160B U160",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3950U2B,
 	    0,
 	    "Adaptec(2)",
-	    "AHA-3950U2B Ultra2",
+	    "AHA-3950U2B U2",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3950U2D,
 	    0,
 	    "Adaptec(2)",
-	    "AHA-3950U2D Ultra2",
+	    "AHA-3950U2D U2",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7896,
 	    0,
 	    "Adaptec(2)",
-	    "AIC-7896/7 Ultra2",
+	    "AIC-7896/7 U2",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3960D,
 	    0,
 	    "Adaptec(2)",
-	    "AHA-3960D Ultra160",
+	    "AHA-3960D U160",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7899B,
@@ -696,7 +696,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7899,
 	    0,
 	    "Adaptec(2)",
-	    "AIC-7899 Ultra160",
+	    "AIC-7899 U160",
 	},
 	{
 	    PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AAC2622,