From: damien <damien@openbsd.org>
Date: Mon, 21 Jul 2008 19:49:06 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c85f9eee86d8777e54f36b7bf73b57d5ac855b53;p=openbsd

sync
---

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 6171368702e..1052c17acc8 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.1387 2008/07/18 11:44:22 reyk Exp 
+ *	OpenBSD: pcidevs,v 1.1388 2008/07/21 19:41:44 damien Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -305,6 +305,7 @@
 #define	PCI_VENDOR_AGEIA	0x1971		/* Ageia */
 #define	PCI_VENDOR_JMICRON	0x197b		/* JMicron */
 #define	PCI_VENDOR_ASPEED	0x1a03		/* ASPEED Technology */
+#define	PCI_VENDOR_AWT	0x1a3b		/* AWT */
 #define	PCI_VENDOR_SYMPHONY2	0x1c1c		/* Symphony Labs */
 #define	PCI_VENDOR_TEKRAM2	0x1de1		/* Tekram */
 #define	PCI_VENDOR_TEHUTI	0x1fc9		/* Tehuti Networks */
@@ -1152,6 +1153,9 @@
 #define	PCI_PRODUCT_AVM_FRITZ_PCI_V2_ISDN	0x0e00		/* Fritz v2.0 ISDN */
 #define	PCI_PRODUCT_AVM_T1	0x1200		/* PRI T1 ISDN */
 
+/* AWT products */
+#define	PCI_PRODUCT_AWT_RT2890	0x1059		/* RT2890 */
+
 /* Belkin Components products */
 #define	PCI_PRODUCT_BELKIN2_F5D6001	0x6001		/* F5D6001 */
 #define	PCI_PRODUCT_BELKIN2_F5D6020V3	0x6020		/* F5D6020V3 */
@@ -3833,10 +3837,10 @@
 #define	PCI_PRODUCT_RALINK_RT2561S	0x0301		/* RT2561S */
 #define	PCI_PRODUCT_RALINK_RT2561	0x0302		/* RT2561 */
 #define	PCI_PRODUCT_RALINK_RT2661	0x0401		/* RT2661 */
-#define	PCI_PRODUCT_RALINK_RT2860_1	0x0601		/* RT2860 */
-#define	PCI_PRODUCT_RALINK_RT2860_1E	0x0681		/* RT2860E */
-#define	PCI_PRODUCT_RALINK_RT2860_2	0x0701		/* RT2860 */
-#define	PCI_PRODUCT_RALINK_RT2860_3	0x0801		/* RT2860 */
+#define	PCI_PRODUCT_RALINK_RT2860	0x0601		/* RT2860 */
+#define	PCI_PRODUCT_RALINK_RT2890	0x0681		/* RT2890 */
+#define	PCI_PRODUCT_RALINK_RT2760	0x0701		/* RT2760 */
+#define	PCI_PRODUCT_RALINK_RT2790	0x0781		/* RT2790 */
 
 /* Realtek products */
 #define	PCI_PRODUCT_REALTEK_RT8029	0x8029		/* 8029 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 5eacbd06a76..f932950a13c 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.1387 2008/07/18 11:44:22 reyk Exp 
+ *	OpenBSD: pcidevs,v 1.1388 2008/07/21 19:41:44 damien Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -2939,6 +2939,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_AVM, PCI_PRODUCT_AVM_T1,
 	    "PRI T1 ISDN",
 	},
+	{
+	    PCI_VENDOR_AWT, PCI_PRODUCT_AWT_RT2890,
+	    "RT2890",
+	},
 	{
 	    PCI_VENDOR_BELKIN2, PCI_PRODUCT_BELKIN2_F5D6001,
 	    "F5D6001",
@@ -12384,20 +12388,20 @@ static const struct pci_known_product pci_known_products[] = {
 	    "RT2661",
 	},
 	{
-	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_1,
+	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860,
 	    "RT2860",
 	},
 	{
-	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_1E,
-	    "RT2860E",
+	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2890,
+	    "RT2890",
 	},
 	{
-	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_2,
-	    "RT2860",
+	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2760,
+	    "RT2760",
 	},
 	{
-	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860_3,
-	    "RT2860",
+	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2790,
+	    "RT2790",
 	},
 	{
 	    PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8029,
@@ -16463,6 +16467,10 @@ static const struct pci_known_vendor pci_known_vendors[] = {
 	    PCI_VENDOR_ASPEED,
 	    "ASPEED Technology",
 	},
+	{
+	    PCI_VENDOR_AWT,
+	    "AWT",
+	},
 	{
 	    PCI_VENDOR_SYMPHONY2,
 	    "Symphony Labs",