diff options
| author | haad <haad@NetBSD.org> | 2008-10-22 10:33:20 +0000 |
|---|---|---|
| committer | haad <haad@NetBSD.org> | 2008-10-22 10:33:20 +0000 |
| commit | b392ebc9c0ff3baf4474e974eaf5e1fa902561fb (patch) | |
| tree | 3f24026c0acdebbca3f87a9c7ad9acd7f2a97ae7 /sys/dev/usb/usbdevs_data.h | |
| parent | 27418aa54648c58092b46e40e7dde8aca60156db (diff) | |
I forgot to commit this after regen.
Diffstat (limited to 'sys/dev/usb/usbdevs_data.h')
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index d032f2b35f4..fc33fc49524 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,4 +1,4 @@ -/* $NetBSD: usbdevs_data.h,v 1.513 2008/10/21 12:21:46 jun Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.514 2008/10/22 10:33:20 haad Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -1719,10 +1719,21 @@ const struct usb_vendor usb_vendors[] = { "Linksys", }, { +<<<<<<< usbdevs_data.h + USB_VENDOR_WINCHIPHEAD2, + "QinHeng Electronics", + }, + { + USB_VENDOR_QUALCOMMINC, + "Qualcomm, Incorporated", + }, + { +======= USB_VENDOR_QUALCOMMINC, "Qualcomm, Incorporated", }, { +>>>>>>> 1.513 USB_VENDOR_DLINK, "D-Link", }, @@ -1851,7 +1862,11 @@ const struct usb_vendor usb_vendors[] = { "GNU Radio USRP", }, }; +<<<<<<< usbdevs_data.h +const int usb_nvendors = 454; +======= const int usb_nvendors = 453; +>>>>>>> 1.513 const struct usb_product usb_products[] = { { @@ -6655,6 +6670,10 @@ const struct usb_product usb_products[] = { "CH341/CH340 USB-Serial Bridge", }, { + USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341, + "CH341 serial/parallel", + }, + { USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G, "UR055G", }, @@ -6807,4 +6826,8 @@ const struct usb_product usb_products[] = { "Prestige", }, }; +<<<<<<< usbdevs_data.h +const int usb_nproducts = 1239; +======= const int usb_nproducts = 1238; +>>>>>>> 1.513 |
