summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2010-01-06 23:24:59 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2010-01-06 23:24:59 +0000
commit90e705402a1238f924c76ac49ba3eac020595d64 (patch)
treef3a9dede3aeb978ebac95202678f02203ceaac04
parentb96161ea6462a5d5d5d3e3d6d1dd3b6408ac55f3 (diff)
sync
-rw-r--r--sys/dev/usb/usbdevs.h6
-rw-r--r--sys/dev/usb/usbdevs_data.h12
2 files changed, 14 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 072946de981..f6df011bea7 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.476 2009/12/27 21:08:15 jsg Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.477 2010/01/06 23:24:58 sthen Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.466 2009/12/27 21:07:23 jsg Exp
+ * OpenBSD: usbdevs,v 1.467 2010/01/06 23:24:22 sthen Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -1029,6 +1029,7 @@
#define USB_PRODUCT_CANON_G1 0x3048 /* PowerShot G1 */
#define USB_PRODUCT_CANON_A20 0x304e /* PowerShot A20 */
#define USB_PRODUCT_CANON_A540 0x311b /* PowerShot A540 */
+#define USB_PRODUCT_CANON_SX100 0x315e /* PowerShot SX100 */
/* CATC products */
#define USB_PRODUCT_CATC_NETMATE 0x000a /* Netmate Ethernet */
@@ -1978,6 +1979,7 @@
#define USB_PRODUCT_LINKSYS4_WUSB600N 0x0071 /* WUSB600N */
#define USB_PRODUCT_LINKSYS4_WUSB54GCV2 0x0073 /* WUSB54GC v2 */
#define USB_PRODUCT_LINKSYS4_WUSB54GCV3 0x0077 /* WUSB54GC v3 */
+#define USB_PRODUCT_LINKSYS4_WUSB600NV2 0x0079 /* WUSB600N v2 */
#define USB_PRODUCT_LINKSYS_MAUSB2 0x0105 /* Camedia MAUSB-2 */
#define USB_PRODUCT_LINKSYS_USB10TX1 0x200c /* USB10TX */
#define USB_PRODUCT_LINKSYS_USB10T 0x2202 /* USB10T Ethernet */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 7c94ac06dfc..dd14fe194d4 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.470 2009/12/27 21:08:15 jsg Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.471 2010/01/06 23:24:58 sthen Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.466 2009/12/27 21:07:23 jsg Exp
+ * OpenBSD: usbdevs,v 1.467 2010/01/06 23:24:22 sthen Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -1198,6 +1198,10 @@ const struct usb_known_product usb_known_products[] = {
"PowerShot A540",
},
{
+ USB_VENDOR_CANON, USB_PRODUCT_CANON_SX100,
+ "PowerShot SX100",
+ },
+ {
USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
"Netmate Ethernet",
},
@@ -3926,6 +3930,10 @@ const struct usb_known_product usb_known_products[] = {
"WUSB54GC v3",
},
{
+ USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB600NV2,
+ "WUSB600N v2",
+ },
+ {
USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_MAUSB2,
"Camedia MAUSB-2",
},