regen

2 files changed, 25 insertions, 15 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index e80e1f00008..80036a8d9a5 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.927 2005/10/02 17:49:16 brad Exp 
+ *	OpenBSD: pcidevs,v 1.928 2005/10/02 22:09:39 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -632,16 +632,16 @@
 #define	PCI_PRODUCT_APPLE_UNINORTH	0x001f		/* Uni-N */
 #define	PCI_PRODUCT_APPLE_UNINORTHETH_FW	0x0018		/* Uni-N Eth Firewire */
 #define	PCI_PRODUCT_APPLE_USB	0x0019		/* USB */
-#define	PCI_PRODUCT_APPLE_UNINORTHAGP	0x0020		/* Uni-N AGP */
+#define	PCI_PRODUCT_APPLE_UNINORTH_AGP	0x0020		/* Uni-N AGP */
 #define	PCI_PRODUCT_APPLE_UNINORTHGMAC	0x0021		/* Uni-N GMAC */
 #define	PCI_PRODUCT_APPLE_KEYLARGO	0x0022		/* Keylargo */
 #define	PCI_PRODUCT_APPLE_PANGEA_GMAC	0x0024		/* Pangea GMAC */
-#define	PCI_PRODUCT_APPLE_PANGEA_MACIO	0x0025		/* Pangea */
+#define	PCI_PRODUCT_APPLE_PANGEA_MACIO	0x0025		/* Pangea Macio */
 #define	PCI_PRODUCT_APPLE_PANGEA_OHCI	0x0026		/* Pangea USB */
 #define	PCI_PRODUCT_APPLE_PANGEA_AGP	0x0027		/* Pangea AGP */
-#define	PCI_PRODUCT_APPLE_PANGEA_PCI1	0x0028		/* Pangea PCI */
-#define	PCI_PRODUCT_APPLE_PANGEA_PCI2	0x0029		/* Pangea PCI */
-#define	PCI_PRODUCT_APPLE_UNINORTH2AGP	0x002d		/* Uni-N2 AGP */
+#define	PCI_PRODUCT_APPLE_PANGEA	0x0028		/* Pangea */
+#define	PCI_PRODUCT_APPLE_PANGEA_PCI	0x0029		/* Pangea PCI */
+#define	PCI_PRODUCT_APPLE_UNINORTH2_AGP	0x002d		/* Uni-N2 AGP */
 #define	PCI_PRODUCT_APPLE_UNINORTH2	0x002e		/* Uni-N2 Host */
 #define	PCI_PRODUCT_APPLE_UNINORTH2ETH	0x002f		/* Uni-N2 Host */
 #define	PCI_PRODUCT_APPLE_PANGEA_FW	0x0030		/* Pangea FireWire */
@@ -655,7 +655,7 @@
 #define	PCI_PRODUCT_APPLE_INTREPID	0x003e		/* Intrepid */
 #define	PCI_PRODUCT_APPLE_INTREPID_OHCI	0x003f		/* Intrepid USB */
 #define	PCI_PRODUCT_APPLE_K2_USB	0x0040		/* K2 USB */
-#define	PCI_PRODUCT_APPLE_K2	0x0041		/* K2 Macio */
+#define	PCI_PRODUCT_APPLE_K2_MACIO	0x0041		/* K2 Macio */
 #define	PCI_PRODUCT_APPLE_K2_FW	0x0042		/* K2 Firewire */
 #define	PCI_PRODUCT_APPLE_K2_ATA	0x0043		/* K2 ATA */
 #define	PCI_PRODUCT_APPLE_U3_PPB1	0x0045		/* U3 PCI-PCI */
@@ -673,7 +673,9 @@
 #define	PCI_PRODUCT_APPLE_SHASTA_PCI2	0x0054		/* Shasta PCI */
 #define	PCI_PRODUCT_APPLE_SHASTA_PCI3	0x0055		/* Shasta PCI */
 #define	PCI_PRODUCT_APPLE_SHASTA_HT	0x0056		/* Shasta HyperTransport */
+#define	PCI_PRODUCT_APPLE_K2	0x0057		/* K2 */
 #define	PCI_PRODUCT_APPLE_U3L_AGP	0x0058		/* U3L AGP */
+#define	PCI_PRODUCT_APPLE_K2_AGP	0x0059		/* K2 AGP */
 #define	PCI_PRODUCT_APPLE_BCM5701	0x1645		/* BCM5701 */
 
 /* Aralion products */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 4b72dbec90f..48857985759 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.927 2005/10/02 17:49:16 brad Exp 
+ *	OpenBSD: pcidevs,v 1.928 2005/10/02 22:09:39 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -1171,7 +1171,7 @@ static const struct pci_known_product pci_known_products[] = {
 	    "USB",
 	},
 	{
-	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTHAGP,
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH_AGP,
 	    "Uni-N AGP",
 	},
 	{
@@ -1188,7 +1188,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PANGEA_MACIO,
-	    "Pangea",
+	    "Pangea Macio",
 	},
 	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PANGEA_OHCI,
@@ -1199,15 +1199,15 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Pangea AGP",
 	},
 	{
-	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PANGEA_PCI1,
-	    "Pangea PCI",
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PANGEA,
+	    "Pangea",
 	},
 	{
-	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PANGEA_PCI2,
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_PANGEA_PCI,
 	    "Pangea PCI",
 	},
 	{
-	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH2AGP,
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH2_AGP,
 	    "Uni-N2 AGP",
 	},
 	{
@@ -1263,7 +1263,7 @@ static const struct pci_known_product pci_known_products[] = {
 	    "K2 USB",
 	},
 	{
-	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_K2,
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_K2_MACIO,
 	    "K2 Macio",
 	},
 	{
@@ -1335,10 +1335,18 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Shasta HyperTransport",
 	},
 	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_K2,
+	    "K2",
+	},
+	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_U3L_AGP,
 	    "U3L AGP",
 	},
 	{
+	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_K2_AGP,
+	    "K2 AGP",
+	},
+	{
 	    PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_BCM5701,
 	    "BCM5701",
 	},