Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I forgot to commit this after regen.

This commit is contained in:
haad 2008-10-22 10:33:20 +00:00
parent 27418aa546
commit b392ebc9c0
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/usb/usbdevs_data.h
View File

@ -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[] = {
{
@ -6654,6 +6669,10 @@ const struct usb_product usb_products[] = {
USB_VENDOR_WINCHIPHEAD, USB_PRODUCT_WINCHIPHEAD_CH341SER,
"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