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

regen. (how is it possible to have conflicts in the repo in a generated file?)

This commit is contained in:
cegger 2008-10-22 12:10:48 +00:00
parent d7acf79ee6
commit f982353b74
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/usb/usbdevs.h
View File

@ -1,10 +1,10 @@
/* $NetBSD: usbdevs.h,v 1.513 2008/10/22 10:27:28 haad Exp $ */
/* ??? */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* NetBSD: usbdevs,v 1.517 2008/10/21 12:20:44 jun Exp
* NetBSD: usbdevs,v 1.518 2008/10/22 10:23:51 haad Exp
*/
/*

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

@ -1,10 +1,10 @@
/* $NetBSD: usbdevs_data.h,v 1.514 2008/10/22 10:33:20 haad Exp $ */
/* ??? */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* NetBSD: usbdevs,v 1.517 2008/10/21 12:20:44 jun Exp
* NetBSD: usbdevs,v 1.518 2008/10/22 10:23:51 haad Exp
*/
/*
@ -1719,7 +1719,6 @@ const struct usb_vendor usb_vendors[] = {
"Linksys",
},
{
<<<<<<< usbdevs_data.h
USB_VENDOR_WINCHIPHEAD2,
"QinHeng Electronics",
},
@ -1728,12 +1727,6 @@ const struct usb_vendor usb_vendors[] = {
"Qualcomm, Incorporated",
},
{
=======
USB_VENDOR_QUALCOMMINC,
"Qualcomm, Incorporated",
},
{
>>>>>>> 1.513
USB_VENDOR_DLINK,
"D-Link",
},
@ -1862,11 +1855,7 @@ 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[] = {
{
@ -6826,8 +6815,4 @@ const struct usb_product usb_products[] = {
"Prestige",
},
};
<<<<<<< usbdevs_data.h
const int usb_nproducts = 1239;
=======
const int usb_nproducts = 1238;
>>>>>>> 1.513