From: gilles <gilles@openbsd.org>
Date: Thu, 2 Jan 2014 07:43:14 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=547af48ca373e5dbbad546b421719b80ffab37e7;p=openbsd

sync
---

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 90c48bd96e3..3e7fdec75e3 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.1702 2013/12/30 02:10:58 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1703 2013/12/31 20:37:38 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -253,6 +253,7 @@
 #define	PCI_VENDOR_EDIMAX	0x1432		/* Edimax */
 #define	PCI_VENDOR_TAMARACK	0x143d		/* Tamarack */
 #define	PCI_VENDOR_WORKBIT	0x1145		/* Workbit */
+#define	PCI_VENDOR_SAMSUNG2	0x144d		/* Samsung */
 #define	PCI_VENDOR_ASKEY	0x144f		/* Askey */
 #define	PCI_VENDOR_AVERMEDIA	0x1461		/* Avermedia */
 #define	PCI_VENDOR_MSI	0x1462		/* MSI */
@@ -5724,6 +5725,7 @@
 
 /* Samsung products */
 #define	PCI_PRODUCT_SAMSUNG_SWL2210P	0xa000		/* MagicLAN SWL-2210P */
+#define	PCI_PRODUCT_SAMSUNG2_XP941	0xa800		/* XP941 */
 
 /* Sangoma products */
 #define	PCI_PRODUCT_SANGOMA_A10X	0x0300		/* A10x */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 7c3714fac73..0c18da3b602 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.1702 2013/12/30 02:10:58 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1703 2013/12/31 20:37:38 brad Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -19655,6 +19655,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_SAMSUNG, PCI_PRODUCT_SAMSUNG_SWL2210P,
 	    "MagicLAN SWL-2210P",
 	},
+	{
+	    PCI_VENDOR_SAMSUNG2, PCI_PRODUCT_SAMSUNG2_XP941,
+	    "XP941",
+	},
 	{
 	    PCI_VENDOR_SANGOMA, PCI_PRODUCT_SANGOMA_A10X,
 	    "A10x",
@@ -23495,6 +23499,10 @@ static const struct pci_known_vendor pci_known_vendors[] = {
 	    PCI_VENDOR_WORKBIT,
 	    "Workbit",
 	},
+	{
+	    PCI_VENDOR_SAMSUNG2,
+	    "Samsung",
+	},
 	{
 	    PCI_VENDOR_ASKEY,
 	    "Askey",