From: ho <ho@openbsd.org>
Date: Tue, 11 Apr 2000 13:57:39 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a1055bd13732b6cc86d6213b32614ab361b937af;p=openbsd

sync
---

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index f241caf03d0..238dbdaffc4 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.239 2000/04/10 16:17:10 mickey Exp 
+ *		OpenBSD: pcidevs,v 1.240 2000/04/11 13:56:40 ho Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -1134,7 +1134,8 @@
 #define	PCI_PRODUCT_NEOMAGIC_NM2160	0x0004		/* Magicgraph NM2160 */
 #define	PCI_PRODUCT_NEOMAGIC_NM2200	0x0005		/* Magicgraph NM2200 */
 #define	PCI_PRODUCT_NEOMAGIC_NM2360	0x0006		/* Magicgraph NM2360 */
-#define	PCI_PRODUCT_NEOMAGIC_MM256AV	0x8005		/* MagicMedia 256AV */
+#define	PCI_PRODUCT_NEOMAGIC_NM256AV	0x8005		/* MagicMedia 256AV */
+#define	PCI_PRODUCT_NEOMAGIC_NM256ZX	0x8006		/* MagicMedia 256ZX */
 
 /* Netgear products */
 #define	PCI_PRODUCT_NETGEAR_GA620	0x620a		/* GA620 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 6fc2c5a74d2..eb9c88c0172 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.239 2000/04/10 16:17:10 mickey Exp 
+ *		OpenBSD: pcidevs,v 1.240 2000/04/11 13:56:40 ho Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
@@ -2511,11 +2511,17 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Magicgraph NM2360",
 	},
 	{
-	    PCI_VENDOR_NEOMAGIC, PCI_PRODUCT_NEOMAGIC_MM256AV,
+	    PCI_VENDOR_NEOMAGIC, PCI_PRODUCT_NEOMAGIC_NM256AV,
 	    0,
 	    "Neomagic",
 	    "MagicMedia 256AV",
 	},
+	{
+	    PCI_VENDOR_NEOMAGIC, PCI_PRODUCT_NEOMAGIC_NM256ZX,
+	    0,
+	    "Neomagic",
+	    "MagicMedia 256ZX",
+	},
 	{
 	    PCI_VENDOR_NETGEAR, PCI_PRODUCT_NETGEAR_GA620,
 	    0,