Sync.

2 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 6bb10bd94e9..f5ee3310c79 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.1294 2007/11/15 21:40:22 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.1295 2007/11/25 16:47:33 krw Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -867,7 +867,7 @@
 #define	PCI_PRODUCT_ATI_IXP_LPC_600	0x438d		/* IXP600 LPC */
 #define	PCI_PRODUCT_ATI_IXP_MODEM_600	0x438e		/* IXP600 Modem */
 #define	PCI_PRODUCT_ATI_IXP_SATA_700_1	0x4390		/* IXP700 SATA IDE */
-#define	PCI_PRODUCT_ATI_IXP_SATA_700_2	0x4391		/* IXP700 SATA AHCI */
+#define	PCI_PRODUCT_ATI_IXP_SATA_700_2	0x4391		/* IXP700 AHCI */
 #define	PCI_PRODUCT_ATI_IXP_SATA_700_3	0x4392		/* IXP700 SATA NRAID5 */
 #define	PCI_PRODUCT_ATI_IXP_SATA_700_4	0x4393		/* IXP700 SATA RAID5 */
 #define	PCI_PRODUCT_ATI_MACH64_ET	0x4554		/* Mach64 ET */
@@ -2132,7 +2132,7 @@
 #define	PCI_PRODUCT_INTEL_82801FB_IDE	0x266f		/* 82801FB IDE */
 #define	PCI_PRODUCT_INTEL_6321ESB_LPC	0x2670		/* 6321ESB LPC */
 #define	PCI_PRODUCT_INTEL_6321ESB_SATA	0x2680		/* 6321ESB SATA */
-#define	PCI_PRODUCT_INTEL_6321ESB_AHCI	0x2681		/* 6321ESB AHCI SATA */
+#define	PCI_PRODUCT_INTEL_6321ESB_AHCI	0x2681		/* 6321ESB AHCI */
 #define	PCI_PRODUCT_INTEL_6321ESB_RAID_1	0x2682		/* 6321ESB SATA RAID */
 #define	PCI_PRODUCT_INTEL_6321ESB_RAID_2	0x2683		/* 6321ESB SATA RAID */
 #define	PCI_PRODUCT_INTEL_6321ESB_USB_1	0x2688		/* 6321ESB USB */
@@ -2170,10 +2170,10 @@
 #define	PCI_PRODUCT_INTEL_82801GBM_LPC	0x27b9		/* 82801GBM LPC */
 #define	PCI_PRODUCT_INTEL_82801GHM_LPC	0x27bd		/* 82801GHM LPC */
 #define	PCI_PRODUCT_INTEL_82801GB_SATA	0x27c0		/* 82801GB SATA */
-#define	PCI_PRODUCT_INTEL_82801GR_AHCI	0x27c1		/* 82801GR AHCI SATA */
+#define	PCI_PRODUCT_INTEL_82801GR_AHCI	0x27c1		/* 82801GR AHCI */
 #define	PCI_PRODUCT_INTEL_82801GR_SATA	0x27c3		/* 82801GR SATA */
 #define	PCI_PRODUCT_INTEL_82801GBM_SATA	0x27c4		/* 82801GBM SATA */
-#define	PCI_PRODUCT_INTEL_82801GBM_AHCI	0x27c5		/* 82801GBM AHCI SATA */
+#define	PCI_PRODUCT_INTEL_82801GBM_AHCI	0x27c5		/* 82801GBM AHCI */
 #define	PCI_PRODUCT_INTEL_82801GHM_RAID	0x27c6		/* 82801GHM SATA RAID */
 #define	PCI_PRODUCT_INTEL_82801GB_USB_1	0x27c8		/* 82801GB USB */
 #define	PCI_PRODUCT_INTEL_82801GB_USB_2	0x27c9		/* 82801GB USB */
@@ -2198,7 +2198,7 @@
 #define	PCI_PRODUCT_INTEL_82801HO_LPC	0x2814		/* 82801HO LPC */
 #define	PCI_PRODUCT_INTEL_82801HBM_LPC	0x2815		/* 82801HBM LPC */
 #define	PCI_PRODUCT_INTEL_82801H_SATA_1_6P	0x2820		/* 82801H SATA */
-#define	PCI_PRODUCT_INTEL_82801H_AHCI	0x2821		/* 82801H AHCI SATA */
+#define	PCI_PRODUCT_INTEL_82801H_AHCI	0x2821		/* 82801H AHCI */
 #define	PCI_PRODUCT_INTEL_82801H_RAID	0x2822		/* 82801H RAID */
 #define	PCI_PRODUCT_INTEL_82801H_SATA_1_4P	0x2824		/* 82801H SATA */
 #define	PCI_PRODUCT_INTEL_82801H_SATA_2	0x2825		/* 82801H SATA */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index e001b2ee085..6e384ab1b96 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.1294 2007/11/15 21:40:22 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.1295 2007/11/25 16:47:33 krw Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -1905,7 +1905,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_700_2,
-	    "IXP700 SATA AHCI",
+	    "IXP700 AHCI",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SATA_700_3,
@@ -6329,7 +6329,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6321ESB_AHCI,
-	    "6321ESB AHCI SATA",
+	    "6321ESB AHCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6321ESB_RAID_1,
@@ -6481,7 +6481,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801GR_AHCI,
-	    "82801GR AHCI SATA",
+	    "82801GR AHCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801GR_SATA,
@@ -6493,7 +6493,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801GBM_AHCI,
-	    "82801GBM AHCI SATA",
+	    "82801GBM AHCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801GHM_RAID,
@@ -6593,7 +6593,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_AHCI,
-	    "82801H AHCI SATA",
+	    "82801H AHCI",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_RAID,