From: deraadt <deraadt@openbsd.org>
Date: Tue, 7 Jan 2014 14:06:16 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=eb7c2633d28999d7515f92e8ddfa05d8455f7e44;p=openbsd

sync
---

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index f4a6609631c..abfcdcd267c 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.1708 2014/01/05 23:55:25 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1709 2014/01/07 14:06:10 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -1853,8 +1853,10 @@
 #define	PCI_PRODUCT_ATTANSIC_L1C	0x1063		/* L1C */
 #define	PCI_PRODUCT_ATTANSIC_L1D	0x1073		/* L1D */
 #define	PCI_PRODUCT_ATTANSIC_L1D_1	0x1083		/* L1D */
-#define	PCI_PRODUCT_ATTANSIC_L2F	0x1090		/* L2F */
-#define	PCI_PRODUCT_ATTANSIC_L1F	0x1091		/* L1F */
+#define	PCI_PRODUCT_ATTANSIC_L2F	0x1090		/* AR8162 */
+#define	PCI_PRODUCT_ATTANSIC_L1F	0x1091		/* AR8161 */
+#define	PCI_PRODUCT_ATTANSIC_L2F_1	0x10a0		/* AR8172 */
+#define	PCI_PRODUCT_ATTANSIC_L1F_1	0x10a1		/* AR8171 */
 #define	PCI_PRODUCT_ATTANSIC_L2	0x2048		/* L2 */
 #define	PCI_PRODUCT_ATTANSIC_L2C_1	0x2060		/* L2C */
 #define	PCI_PRODUCT_ATTANSIC_L2C_2	0x2062		/* L2C */
@@ -3202,6 +3204,7 @@
 #define	PCI_PRODUCT_INTEL_7SERIES_RAID_2	0x1e06		/* 7 Series RAID */
 #define	PCI_PRODUCT_INTEL_7SERIES_RAID_3	0x1e07		/* 7 Series RAID */
 #define	PCI_PRODUCT_INTEL_7SERIES_SATA_3	0x1e08		/* 7 Series SATA */
+#define	PCI_PRODUCT_INTEL_7SERIES_SATA_4	0x1e09		/* 7 Series SATA */
 #define	PCI_PRODUCT_INTEL_7SERIES_RAID_4	0x1e0e		/* 7 Series RAID */
 #define	PCI_PRODUCT_INTEL_7SERIES_PCIE_1	0x1e10		/* 7 Series PCIE */
 #define	PCI_PRODUCT_INTEL_7SERIES_PCIE_2	0x1e12		/* 7 Series PCIE */
@@ -5620,6 +5623,8 @@
 #define	PCI_PRODUCT_RALINK_RT3090	0x3090		/* RT3090 */
 #define	PCI_PRODUCT_RALINK_RT3091	0x3091		/* RT3091 */
 #define	PCI_PRODUCT_RALINK_RT3092	0x3092		/* RT3092 */
+#define	PCI_PRODUCT_RALINK_RT3290	0x3290		/* RT3290 */
+#define	PCI_PRODUCT_RALINK_RT3298	0x3298		/* Bluetooth */
 #define	PCI_PRODUCT_RALINK_RT3562	0x3562		/* RT3562 */
 #define	PCI_PRODUCT_RALINK_RT3592	0x3592		/* RT3592 */
 #define	PCI_PRODUCT_RALINK_RT3593	0x3593		/* RT3593 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index f4f8c9a47f4..3fff763bba2 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.1708 2014/01/05 23:55:25 brad Exp 
+ *	OpenBSD: pcidevs,v 1.1709 2014/01/07 14:06:10 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -5653,11 +5653,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L2F,
-	    "L2F",
+	    "AR8162",
 	},
 	{
 	    PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L1F,
-	    "L1F",
+	    "AR8161",
+	},
+	{
+	    PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L2F_1,
+	    "AR8172",
+	},
+	{
+	    PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L1F_1,
+	    "AR8171",
 	},
 	{
 	    PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L2,
@@ -10371,6 +10379,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_SATA_3,
 	    "7 Series SATA",
 	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_SATA_4,
+	    "7 Series SATA",
+	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_RAID_4,
 	    "7 Series RAID",
@@ -19291,6 +19303,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3092,
 	    "RT3092",
 	},
+	{
+	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3290,
+	    "RT3290",
+	},
+	{
+	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3298,
+	    "Bluetooth",
+	},
 	{
 	    PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3562,
 	    "RT3562",
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index c8448a476a6..4e75856f2a4 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.630 2014/01/07 14:00:54 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.631 2014/01/07 14:06:51 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.619 2014/01/07 14:00:51 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.620 2014/01/07 14:06:48 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -592,6 +592,7 @@
 #define	USB_VENDOR_TCTMOBILE	0x1bbb		/* TCT Mobile */
 #define	USB_VENDOR_MDS	0x1bc8		/* MDS */
 #define	USB_VENDOR_ALTI2	0x1bc9		/* Alti-2 */
+#define	USB_VENDOR_SUNPLUS	0x1bcf		/* Sunplus */
 #define	USB_VENDOR_WAGO	0x1be3		/* WAGO Kontakttechnik */
 #define	USB_VENDOR_LONGCHEER	0x1c9e		/* Longcheer Technology */
 #define	USB_VENDOR_DRESDENELEC	0x1cf1		/* Dresden Elektronic */
@@ -1470,6 +1471,7 @@
 #define	USB_PRODUCT_DLINK_DUBE100B1	0x3c05		/* DUB-E100 rev B1 */
 #define	USB_PRODUCT_DLINK_RT2870	0x3c09		/* RT2870 */
 #define	USB_PRODUCT_DLINK_RT3072	0x3c0a		/* RT3072 */
+#define	USB_PRODUCT_DLINK_DWA140B3	0x3c15		/* DWA-140 rev B3 */
 #define	USB_PRODUCT_DLINK_DWA127	0x3c1b		/* DWA-127 */
 #define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps Ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX1	0x4001		/* 10/100 Ethernet */
@@ -3398,6 +3400,7 @@
 #define	USB_PRODUCT_RALINK_RT3072	0x3072		/* RT3072 */
 #define	USB_PRODUCT_RALINK_RT3370	0x3370		/* RT3370 */
 #define	USB_PRODUCT_RALINK_RT3572	0x3572		/* RT3572 */
+#define	USB_PRODUCT_RALINK_RT5370	0x5370		/* RT5370 */
 #define	USB_PRODUCT_RALINK_RT8070	0x8070		/* RT8070 */
 #define	USB_PRODUCT_RALINK_RT2570_3	0x9020		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2573_2	0x9021		/* RT2573 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index c8875c1bad1..3dd72a500a1 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.624 2014/01/07 14:00:54 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.625 2014/01/07 14:06:51 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.619 2014/01/07 14:00:51 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.620 2014/01/07 14:06:48 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2361,6 +2361,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RT3072,
 	    "RT3072",
 	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA140B3,
+	    "DWA-140 rev B3",
+	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA127,
 	    "DWA-127",
@@ -8301,6 +8305,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3572,
 	    "RT3572",
 	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT5370,
+	    "RT5370",
+	},
 	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT8070,
 	    "RT8070",
@@ -13025,6 +13033,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    USB_VENDOR_ALTI2,
 	    "Alti-2",
 	},
+	{
+	    USB_VENDOR_SUNPLUS,
+	    "Sunplus",
+	},
 	{
 	    USB_VENDOR_WAGO,
 	    "WAGO Kontakttechnik",