summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-12-31 17:35:01 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-12-31 17:35:01 +0000
commitc4cdfed73d56454ee674efb524074b039110717b (patch)
tree393aed3c92a295e5f0ba4846136ae9be130dbd1f /sys/dev/pci
parentd71a3ad11b60b48f15ae4e279e7d05de9926b7ab (diff)
sync
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/pcidevs.h6
-rw-r--r--sys/dev/pci/pcidevs_data.h18
2 files changed, 17 insertions, 7 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 060fff1cfd0..acd410737de 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.1518 2009/12/25 22:01:34 miod Exp
+ * OpenBSD: pcidevs,v 1.1519 2009/12/31 17:34:19 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -1609,7 +1609,6 @@
#define PCI_PRODUCT_CIRRUS_CS4610 0x6001 /* CS4610 SoundFusion */
#define PCI_PRODUCT_CIRRUS_CS4615 0x6004 /* CS4615 */
#define PCI_PRODUCT_CIRRUS_CS4280 0x6003 /* CS4280/46xx CrystalClear */
-#define PCI_PRODUCT_CIRRUS_CS4615 0x6004 /* CS4615 */
#define PCI_PRODUCT_CIRRUS_CS4281 0x6005 /* CS4281 CrystalClear */
/* CMD Technology products -- info gleaned from www.cmd.com */
@@ -4564,6 +4563,9 @@
#define PCI_PRODUCT_RICOH_R5C832 0x0832 /* 5C832 Firewire */
#define PCI_PRODUCT_RICOH_R5C843 0x0843 /* 5C843 MMC */
#define PCI_PRODUCT_RICOH_R5C852 0x0852 /* 5C852 xD */
+#define PCI_PRODUCT_RICOH_R5U230 0xe230 /* 5U230 Memory Stick */
+#define PCI_PRODUCT_RICOH_R5U822 0xe822 /* 5U822 SD/MMC */
+#define PCI_PRODUCT_RICOH_R5U832 0xe832 /* 5U832 Firewire */
/* Rockwell products */
#define PCI_PRODUCT_ROCKWELL_RS56SP_PCI11P1 0x2005 /* RS56/SP-PCI11P1 Modem */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 34b79e3c155..594124bf805 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.1518 2009/12/25 22:01:34 miod Exp
+ * OpenBSD: pcidevs,v 1.1519 2009/12/31 17:34:19 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -4628,10 +4628,6 @@ static const struct pci_known_product pci_known_products[] = {
"CS4280/46xx CrystalClear",
},
{
- PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4615,
- "CS4615",
- },
- {
PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4281,
"CS4281 CrystalClear",
},
@@ -15204,6 +15200,18 @@ static const struct pci_known_product pci_known_products[] = {
"5C852 xD",
},
{
+ PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_R5U230,
+ "5U230 Memory Stick",
+ },
+ {
+ PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_R5U822,
+ "5U822 SD/MMC",
+ },
+ {
+ PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_R5U832,
+ "5U832 Firewire",
+ },
+ {
PCI_VENDOR_ROCKWELL, PCI_PRODUCT_ROCKWELL_RS56SP_PCI11P1,
"RS56/SP-PCI11P1 Modem",
},