regen

2 files changed, 37 insertions, 12 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 1b421aa9694..17466c218b1 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.894 2005/07/23 17:00:40 fgsch Exp 
+ *	OpenBSD: pcidevs,v 1.895 2005/07/25 06:51:20 jsg Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -663,6 +663,7 @@
 #define	PCI_PRODUCT_ASUSTEK_HFCPCI	0x0675		/* ISDN */
 
 /* ATI Technologies */
+#define	PCI_PRODUCT_ATI_RADEON_M241P	0x3150		/* Radeon Mobility X600 */
 #define	PCI_PRODUCT_ATI_RADEON_9600PRO	0x4150		/* Radeon 9600 Pro */
 #define	PCI_PRODUCT_ATI_RADEON_9600	0x4151		/* Radeon 9600 */
 #define	PCI_PRODUCT_ATI_RADEON_9600XT	0x4152		/* Radeon 9600 XT */
@@ -894,6 +895,7 @@
 #define	PCI_PRODUCT_BROADCOM_BCM5901A2	0x170e		/* BCM5901A2 */
 #define	PCI_PRODUCT_BROADCOM_BCM4306	0x4320		/* BCM4306 */
 #define	PCI_PRODUCT_BROADCOM_BCM4322	0x4322		/* BCM4322 */
+#define	PCI_PRODUCT_BROADCOM_BCM4309	0x4324		/* BCM4309 */
 #define	PCI_PRODUCT_BROADCOM_SERIAL	0x4333		/* Serial */
 #define	PCI_PRODUCT_BROADCOM_BCM4401	0x4401		/* BCM4401 */
 #define	PCI_PRODUCT_BROADCOM_5801	0x5801		/* 5801 */
@@ -1531,8 +1533,6 @@
 #define	PCI_PRODUCT_INTEL_82845G	0x2560		/* 82845G/GL */
 #define	PCI_PRODUCT_INTEL_82845G_AGP	0x2561		/* 82845G/GL/GV/GE/PE AGP */
 #define	PCI_PRODUCT_INTEL_82845G_IGD	0x2562		/* 82845G/GL Video */
-#define	PCI_PRODUCT_INTEL_915GM_HB	0x2590		/* 915GM/PM/GMS Host */
-#define	PCI_PRODUCT_INTEL_915GM_IGD	0x2592		/* 915GM/GMS Video */
 #define	PCI_PRODUCT_INTEL_82865_IO_1	0x2570		/* 82865G/PE/P CPU-I/0-1 */
 #define	PCI_PRODUCT_INTEL_82865_AGP	0x2571		/* 82865G/PE/P CPU-AGP */
 #define	PCI_PRODUCT_INTEL_82865_IGD	0x2572		/* 82865G Video */
@@ -1549,6 +1549,9 @@
 #define	PCI_PRODUCT_INTEL_E7221_HB	0x2588		/* E7221 MCH Host */
 #define	PCI_PRODUCT_INTEL_E7221_PCIE	0x2589		/* E7221 PCIE */
 #define	PCI_PRODUCT_INTEL_E7221_IGD	0x258a		/* E7221 Video */
+#define	PCI_PRODUCT_INTEL_915GM_HB	0x2590		/* 915GM/PM/GMS Host */
+#define	PCI_PRODUCT_INTEL_915GM_PCIE	0x2591		/* 915PM/GM PCIE */
+#define	PCI_PRODUCT_INTEL_915GM_IGD	0x2592		/* 915GM/GMS Video */
 #define	PCI_PRODUCT_INTEL_6300ESB_LPC	0x25a1		/* 6300ESB LPC */
 #define	PCI_PRODUCT_INTEL_6300ESB_IDE	0x25a2		/* 6300ESB IDE */
 #define	PCI_PRODUCT_INTEL_6300ESB_SATA	0x25a3		/* 6300ESB SATA */
@@ -2628,6 +2631,8 @@
 #define	PCI_PRODUCT_TI_PCI4520_FW	0x802A		/* PCI4520 FireWire */
 #define	PCI_PRODUCT_TI_PCI7410_FW	0x802b		/* PCI7(4-6)10 FireWire */
 #define	PCI_PRODUCT_TI_PCI7420_FW	0x802e		/* PCI7x20 FireWire */
+#define	PCI_PRODUCT_TI_PCI6515	0x8036		/* PCI6515 CardBus */
+#define	PCI_PRODUCT_TI_PCI6515	0x8038		/* PCI6515 CardBus (Smart Card mode) */
 #define	PCI_PRODUCT_TI_ACX100A	0x8400		/* ACX100A */
 #define	PCI_PRODUCT_TI_ACX100B	0x8401		/* ACX100B */
 #define	PCI_PRODUCT_TI_ACX111	0x9066		/* ACX111 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 71a9ec7323e..da057dcc929 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.894 2005/07/23 17:00:40 fgsch Exp 
+ *	OpenBSD: pcidevs,v 1.895 2005/07/25 06:51:20 jsg Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -1271,6 +1271,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "ISDN",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_M241P,
+	    "Radeon Mobility X600",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9600PRO,
 	    "Radeon 9600 Pro",
 	},
@@ -2107,6 +2111,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "BCM4322",
 	},
 	{
+	    PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM4309,
+	    "BCM4309",
+	},
+	{
 	    PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_SERIAL,
 	    "Serial",
 	},
@@ -4183,14 +4191,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82845G/GL Video",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_915GM_HB,
-	    "915GM/PM/GMS Host",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_915GM_IGD,
-	    "915GM/GMS Video",
-	},
-	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82865_IO_1,
 	    "82865G/PE/P CPU-I/0-1",
 	},
@@ -4255,6 +4255,18 @@ static const struct pci_known_product pci_known_products[] = {
 	    "E7221 Video",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_915GM_HB,
+	    "915GM/PM/GMS Host",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_915GM_PCIE,
+	    "915PM/GM PCIE",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_915GM_IGD,
+	    "915GM/GMS Video",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6300ESB_LPC,
 	    "6300ESB LPC",
 	},
@@ -7787,6 +7799,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "PCI7x20 FireWire",
 	},
 	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI6515,
+	    "PCI6515 CardBus",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI6515,
+	    "PCI6515 CardBus (Smart Card mode)",
+	},
+	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_ACX100A,
 	    "ACX100A",
 	},