regen

2 files changed, 70 insertions, 75 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index da1865cf409..238451ea45c 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.1374 2008/06/02 03:45:52 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1375 2008/06/03 03:25:12 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -1584,40 +1584,40 @@
 #define	PCI_PRODUCT_ELSA_QS1PCI	0x1000		/* QuickStep 1000 ISDN */
 
 /* Emulex products */
-#define	PCI_PRODUCT_EMULEX_LPFC	0x10df		/* Light Pulse FibreChannel */
-#define	PCI_PRODUCT_EMULEX_LP6000	0x1ae5		/* Light Pulse 6000 */
-#define	PCI_PRODUCT_EMULEX_LPE121	0xf011		/* Light Pulse e 121 */
-#define	PCI_PRODUCT_EMULEX_LPE1250	0xf015		/* Light Pulse e 1250 */
-#define	PCI_PRODUCT_EMULEX_LP952	0xf095		/* Light Pulse 952 */
-#define	PCI_PRODUCT_EMULEX_LP982	0xf098		/* Light Pulse 982 */
-#define	PCI_PRODUCT_EMULEX_LP101	0xf0a1		/* Light Pulse 101 */
-#define	PCI_PRODUCT_EMULEX_LP1050	0xf0a5		/* Light Pulse 1050 */
-#define	PCI_PRODUCT_EMULEX_LP111	0xf0d1		/* Light Pulse 111 */
-#define	PCI_PRODUCT_EMULEX_LP1150	0xf0d5		/* Light Pulse 1150 */
-#define	PCI_PRODUCT_EMULEX_LPE111	0xf0e1		/* Light Pulse e 111 */
-#define	PCI_PRODUCT_EMULEX_LPE1150	0xf0e5		/* Light Pulse e 1150 */
-#define	PCI_PRODUCT_EMULEX_LPE1000	0xf0f5		/* Light Pulse e 1000 */
-#define	PCI_PRODUCT_EMULEX_LPE1000_SP	0xf0f6		/* Light Pulse e 1000-SP */
-#define	PCI_PRODUCT_EMULEX_LPE1002_SP	0xf0f7		/* Light Pulse e 1002-SP */
-#define	PCI_PRODUCT_EMULEX_LPE12000	0xf100		/* Light Pulse e 12000 */
-#define	PCI_PRODUCT_EMULEX_LPE12000_SP	0xf111		/* Light Pulse e 12000-SP */
-#define	PCI_PRODUCT_EMULEX_LPE12002_SP	0xf112		/* Light Pulse e 12002-SP */
-#define	PCI_PRODUCT_EMULEX_LP7000	0xf700		/* Light Pulse 7000 */
-#define	PCI_PRODUCT_EMULEX_LP8000	0xf800		/* Light Pulse 8000 */
-#define	PCI_PRODUCT_EMULEX_LP9000	0xf900		/* Light Pulse 9000 */
-#define	PCI_PRODUCT_EMULEX_LP9802	0xf980		/* Light Pulse 9802 */
-#define	PCI_PRODUCT_EMULEX_LP10000	0xfa00		/* Light Pulse 10000 */
-#define	PCI_PRODUCT_EMULEX_LPX10000	0xfb00		/* Light Pulse X 10000 */
-#define	PCI_PRODUCT_EMULEX_LP10000_S	0xfc00		/* Light Pulse 10000-S */
-#define	PCI_PRODUCT_EMULEX_LP11000_S	0xfc10		/* Light Pulse 11000-S */
-#define	PCI_PRODUCT_EMULEX_LPE11000_S	0xfc20		/* Light Pulse e 11000-S */
-#define	PCI_PRODUCT_EMULEX_LPE12000_S	0xfc40		/* Light Pulse e 12000-S */
-#define	PCI_PRODUCT_EMULEX_LP11000	0xfd00		/* Light Pulse 11000 */
-#define	PCI_PRODUCT_EMULEX_LP11000_SP	0xfd11		/* Light Pulse 11000-SP */
-#define	PCI_PRODUCT_EMULEX_LP11002_SP	0xfd12		/* Light Pulse 11002-SP */
-#define	PCI_PRODUCT_EMULEX_LPE11000	0xfe00		/* Light Pulse e 11000 */
-#define	PCI_PRODUCT_EMULEX_LPE11000_SP	0xfe11		/* Light Pulse e 11000-SP */
-#define	PCI_PRODUCT_EMULEX_LPE11002_SP	0xfe12		/* Light Pulse e 11002-SP */
+#define	PCI_PRODUCT_EMULEX_LPFC	0x10df		/* LPFC */
+#define	PCI_PRODUCT_EMULEX_LP6000	0x1ae5		/* LP6000 */
+#define	PCI_PRODUCT_EMULEX_LPE121	0xf011		/* LPe121 */
+#define	PCI_PRODUCT_EMULEX_LPE1250	0xf015		/* LPe1250 */
+#define	PCI_PRODUCT_EMULEX_LP952	0xf095		/* LP952 */
+#define	PCI_PRODUCT_EMULEX_LP982	0xf098		/* LP982 */
+#define	PCI_PRODUCT_EMULEX_LP101	0xf0a1		/* LP101 */
+#define	PCI_PRODUCT_EMULEX_LP1050	0xf0a5		/* LP1050 */
+#define	PCI_PRODUCT_EMULEX_LP111	0xf0d1		/* LP111 */
+#define	PCI_PRODUCT_EMULEX_LP1150	0xf0d5		/* LP1150 */
+#define	PCI_PRODUCT_EMULEX_LPE111	0xf0e1		/* LPe111 */
+#define	PCI_PRODUCT_EMULEX_LPE1150	0xf0e5		/* LPe1150 */
+#define	PCI_PRODUCT_EMULEX_LPE1000	0xf0f5		/* LPe1000 */
+#define	PCI_PRODUCT_EMULEX_LPE1000_SP	0xf0f6		/* LPe1000-SP */
+#define	PCI_PRODUCT_EMULEX_LPE1002_SP	0xf0f7		/* LPe1002-SP */
+#define	PCI_PRODUCT_EMULEX_LPE12000	0xf100		/* LPe12000 */
+#define	PCI_PRODUCT_EMULEX_LPE12000_SP	0xf111		/* LPe12000-SP */
+#define	PCI_PRODUCT_EMULEX_LPE12002_SP	0xf112		/* LPe12002-SP */
+#define	PCI_PRODUCT_EMULEX_LP7000	0xf700		/* LP7000 */
+#define	PCI_PRODUCT_EMULEX_LP8000	0xf800		/* LP8000 */
+#define	PCI_PRODUCT_EMULEX_LP9000	0xf900		/* LP9000 */
+#define	PCI_PRODUCT_EMULEX_LP9802	0xf980		/* LP9802 */
+#define	PCI_PRODUCT_EMULEX_LP10000	0xfa00		/* LP10000 */
+#define	PCI_PRODUCT_EMULEX_LPX10000	0xfb00		/* LPX10000 */
+#define	PCI_PRODUCT_EMULEX_LP10000_S	0xfc00		/* LP10000-S */
+#define	PCI_PRODUCT_EMULEX_LP11000_S	0xfc10		/* LP11000-S */
+#define	PCI_PRODUCT_EMULEX_LPE11000_S	0xfc20		/* LPe11000-S */
+#define	PCI_PRODUCT_EMULEX_LPE12000_S	0xfc40		/* LPe12000-S */
+#define	PCI_PRODUCT_EMULEX_LP11000	0xfd00		/* LP11000 */
+#define	PCI_PRODUCT_EMULEX_LP11000_SP	0xfd11		/* LP11000-SP */
+#define	PCI_PRODUCT_EMULEX_LP11002_SP	0xfd12		/* LP11002-SP */
+#define	PCI_PRODUCT_EMULEX_LPE11000	0xfe00		/* LPe11000 */
+#define	PCI_PRODUCT_EMULEX_LPE11000_SP	0xfe11		/* LPe11000-SP */
+#define	PCI_PRODUCT_EMULEX_LPE11002_SP	0xfe12		/* LPe11002-SP */
 
 /* Endace Measurement Systems */
 #define	PCI_PRODUCT_ENDACE_DAG35	0x3500		/* Endace Dag3.5 */
@@ -2552,7 +2552,6 @@
 #define	PCI_PRODUCT_INTEL_RCU31L	0x96a1		/* RCU31L I2O RAID */
 #define	PCI_PRODUCT_INTEL_21152	0xb152		/* S21152BB PCI-PCI */
 #define	PCI_PRODUCT_INTEL_21154	0xb154		/* S21154AE/BE PCI-PCI */
-#define	PCI_PRODUCT_INTEL_TURBOMEM	0x444e		/* Intel Turbo Memory */
 
 /* Intergraph products */
 #define	PCI_PRODUCT_INTERGRAPH_4D50T	0x00e4		/* Powerstorm 4D50T */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index b2ceb313d4b..2f9a49f0175 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.1374 2008/06/02 03:45:52 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1375 2008/06/03 03:25:12 brad Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -4353,139 +4353,139 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPFC,
-	    "Light Pulse FibreChannel",
+	    "LPFC",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP6000,
-	    "Light Pulse 6000",
+	    "LP6000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE121,
-	    "Light Pulse e 121",
+	    "LPe121",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1250,
-	    "Light Pulse e 1250",
+	    "LPe1250",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP952,
-	    "Light Pulse 952",
+	    "LP952",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP982,
-	    "Light Pulse 982",
+	    "LP982",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP101,
-	    "Light Pulse 101",
+	    "LP101",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP1050,
-	    "Light Pulse 1050",
+	    "LP1050",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP111,
-	    "Light Pulse 111",
+	    "LP111",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP1150,
-	    "Light Pulse 1150",
+	    "LP1150",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE111,
-	    "Light Pulse e 111",
+	    "LPe111",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1150,
-	    "Light Pulse e 1150",
+	    "LPe1150",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1000,
-	    "Light Pulse e 1000",
+	    "LPe1000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1000_SP,
-	    "Light Pulse e 1000-SP",
+	    "LPe1000-SP",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1002_SP,
-	    "Light Pulse e 1002-SP",
+	    "LPe1002-SP",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12000,
-	    "Light Pulse e 12000",
+	    "LPe12000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12000_SP,
-	    "Light Pulse e 12000-SP",
+	    "LPe12000-SP",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12002_SP,
-	    "Light Pulse e 12002-SP",
+	    "LPe12002-SP",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP7000,
-	    "Light Pulse 7000",
+	    "LP7000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP8000,
-	    "Light Pulse 8000",
+	    "LP8000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP9000,
-	    "Light Pulse 9000",
+	    "LP9000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP9802,
-	    "Light Pulse 9802",
+	    "LP9802",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP10000,
-	    "Light Pulse 10000",
+	    "LP10000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPX10000,
-	    "Light Pulse X 10000",
+	    "LPX10000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP10000_S,
-	    "Light Pulse 10000-S",
+	    "LP10000-S",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11000_S,
-	    "Light Pulse 11000-S",
+	    "LP11000-S",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11000_S,
-	    "Light Pulse e 11000-S",
+	    "LPe11000-S",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12000_S,
-	    "Light Pulse e 12000-S",
+	    "LPe12000-S",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11000,
-	    "Light Pulse 11000",
+	    "LP11000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11000_SP,
-	    "Light Pulse 11000-SP",
+	    "LP11000-SP",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11002_SP,
-	    "Light Pulse 11002-SP",
+	    "LP11002-SP",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11000,
-	    "Light Pulse e 11000",
+	    "LPe11000",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11000_SP,
-	    "Light Pulse e 11000-SP",
+	    "LPe11000-SP",
 	},
 	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11002_SP,
-	    "Light Pulse e 11002-SP",
+	    "LPe11002-SP",
 	},
 	{
 	    PCI_VENDOR_ENDACE, PCI_PRODUCT_ENDACE_DAG35,
@@ -7976,10 +7976,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "S21154AE/BE PCI-PCI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_TURBOMEM,
-	    "Intel Turbo Memory",
-	},
-	{
 	    PCI_VENDOR_INTERGRAPH, PCI_PRODUCT_INTERGRAPH_4D50T,
 	    "Powerstorm 4D50T",
 	},