summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-12-28 21:20:13 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-12-28 21:20:13 +0000
commit8b2e26510413075cfc39ad16b19e826afbbcdd8f (patch)
tree6184b410efc0b4e840d20457c376af2aa93f9def
parentf544bf347b3174198877a47a35254088f6bc91d4 (diff)
sync
-rw-r--r--sys/dev/pci/pcidevs.h5
-rw-r--r--sys/dev/pci/pcidevs_data.h8
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 67d69d36c65..e31028527d4 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.111 1998/12/25 20:18:13 tholo Exp
+ * OpenBSD: pcidevs,v 1.112 1998/12/28 21:19:55 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -1254,3 +1254,6 @@
/* Ziatech products */
#define PCI_PRODUCT_ZIATECH_ZT8905 0x8905 /* PCI-ST32 */
+
+/* Zoran products */
+#define PCI_PRODUCT_ZORAN_ZR36120 0x6120 /* Video */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index f03ec3f2029..ca0d5b54f38 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.111 1998/12/25 20:18:13 tholo Exp
+ * OpenBSD: pcidevs,v 1.112 1998/12/28 21:19:55 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -2991,6 +2991,12 @@ struct pci_knowndev pci_knowndevs[] = {
"PCI-ST32",
},
{
+ PCI_VENDOR_ZORAN, PCI_PRODUCT_ZORAN_ZR36120,
+ 0,
+ "Zoran",
+ "Video",
+ },
+ {
PCI_VENDOR_MARTINMARIETTA, 0,
PCI_KNOWNDEV_NOPROD,
"Martin-Marietta",