summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrian Callahan <bcallah@cvs.openbsd.org>2013-05-06 08:49:24 +0000
committerBrian Callahan <bcallah@cvs.openbsd.org>2013-05-06 08:49:24 +0000
commit707837a9c5095cb5108089267c64fbdb8c73bf16 (patch)
tree956a5e56112bf6bedb39d78ab02e93cde91b9f05 /sys
parent53f78b701b044a30d866c3c0bd79f276b2246e98 (diff)
sync
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/pcidevs.h6
-rw-r--r--sys/dev/pci/pcidevs_data.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 0feaa019bd7..cf8b3fd4f9e 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.1674 2013/05/06 07:53:10 bcallah Exp
+ * OpenBSD: pcidevs,v 1.1675 2013/05/06 08:47:04 bcallah Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -295,7 +295,7 @@
#define PCI_VENDOR_NETOCTAVE 0x170b /* Netoctave */
#define PCI_VENDOR_ALTIMA 0x173b /* Altima */
#define PCI_VENDOR_ANTARES 0x1754 /* Antares Microsystems */
-#define PCI_VENDOR_CAVIUM 0x177d /* Cavium Networks */
+#define PCI_VENDOR_CAVIUM 0x177d /* Cavium */
#define PCI_VENDOR_BELKIN2 0x1799 /* Belkin */
#define PCI_VENDOR_HAWKING 0x17b3 /* Hawking Technology */
#define PCI_VENDOR_NETCHIP 0x17cc /* NetChip Technology */
@@ -1786,7 +1786,7 @@
#define PCI_PRODUCT_CAVIUM_NITROX 0x0001 /* NITROX XL */
#define PCI_PRODUCT_CAVIUM_NITROX_LITE 0x0003 /* NITROX Lite */
#define PCI_PRODUCT_CAVIUM_NITROX_PX 0x0010 /* NITROX PX */
-#define PCI_PRODUCT_CAVIUM_OCTEON_CN50XX 0x0070 /* OCTEON Plus CN50XX Network Processor */
+#define PCI_PRODUCT_CAVIUM_OCTEON_CN50XX 0x0070 /* OCTEON Plus CN50XX */
/* CCUBE products */
#define PCI_PRODUCT_CCUBE_CINEMASTER 0x8888 /* Cinemaster */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index afbe028341c..7c301b7641c 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.1674 2013/05/06 07:53:10 bcallah Exp
+ * OpenBSD: pcidevs,v 1.1675 2013/05/06 08:47:04 bcallah Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -5289,7 +5289,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_CAVIUM, PCI_PRODUCT_CAVIUM_OCTEON_CN50XX,
- "OCTEON Plus CN50XX Network Processor",
+ "OCTEON Plus CN50XX",
},
{
PCI_VENDOR_CCUBE, PCI_PRODUCT_CCUBE_CINEMASTER,
@@ -21833,7 +21833,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {
},
{
PCI_VENDOR_CAVIUM,
- "Cavium Networks",
+ "Cavium",
},
{
PCI_VENDOR_BELKIN2,