remove duplicate device ids

5 files changed, 6 insertions, 15 deletions

diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 7c49042002e..dc1d8d3845c 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.127 2019/08/27 14:57:48 stsp Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.128 2020/01/05 08:58:25 jsg Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -178,8 +178,6 @@ struct atu_type atu_devs[] = {
 	  RadioRFMD,		ATU_NO_QUIRK },
 	{ USB_VENDOR_LINKSYS,	USB_PRODUCT_LINKSYS_WUSB11,
 	  RadioIntersil,	ATU_NO_QUIRK },
-	{ USB_VENDOR_LINKSYS2,	USB_PRODUCT_LINKSYS2_WUSB11,
-	  RadioRFMD,		ATU_NO_QUIRK },
 	{ USB_VENDOR_LINKSYS2,	USB_PRODUCT_LINKSYS2_NWU11B,
 	  RadioRFMD,		ATU_NO_QUIRK },
 	{ USB_VENDOR_LINKSYS3,	USB_PRODUCT_LINKSYS3_WUSB11V28,
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 5f41c17486f..7c1fe2c8ea3 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.127 2019/09/12 12:55:07 stsp Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.128 2020/01/05 08:58:25 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -137,7 +137,6 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(CONCEPTRONIC2,	RT2870_1),
 	USB_ID(CONCEPTRONIC2,	RT2870_2),
 	USB_ID(CONCEPTRONIC2,	RT2870_3),
-	USB_ID(CONCEPTRONIC2,	RT2870_4),
 	USB_ID(CONCEPTRONIC2,	RT2870_5),
 	USB_ID(CONCEPTRONIC2,	RT2870_6),
 	USB_ID(CONCEPTRONIC2,	RT2870_7),
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 06f54e4db8a..4e5bad338ee 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.84 2018/10/02 19:49:10 stsp Exp $ */
+/*	$OpenBSD: if_url.c,v 1.85 2020/01/05 08:58:25 jsg Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -146,7 +146,6 @@ static const struct url_type {
 #define URL_EXT_PHY	0x0001
 } url_devs [] = {
 	{{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_LCS8138TX}, 0},
-	{{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RTL8151}, 0},
 	{{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAKTX }, 0},
 	{{ USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR}, 0},
 	{{ USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01}, 0},
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index 2a88b3971f7..5bf2a0da9c3 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.86 2020/01/05 00:54:13 jsg Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.87 2020/01/05 08:58:25 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -255,7 +255,6 @@ static const struct urtwn_type {
 	URTWN_DEV_8192CU(BELKIN,	RTL8188CUS),
 	URTWN_DEV_8192CU(BELKIN,	RTL8192CU),
 	URTWN_DEV_8192CU(BELKIN,	RTL8192CU_1),
-	URTWN_DEV_8192CU(BELKIN,	RTL8192CU_2),
 	URTWN_DEV_8192CU(CHICONY,	RTL8188CUS_1),
 	URTWN_DEV_8192CU(CHICONY,	RTL8188CUS_2),
 	URTWN_DEV_8192CU(CHICONY,	RTL8188CUS_3),
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index c727d4c2488..69394c0fea0 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.705 2020/01/05 06:34:39 jsg Exp $
+$OpenBSD: usbdevs,v 1.706 2020/01/05 08:58:25 jsg Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -716,7 +716,6 @@ product ABOCOM XX5		0x4007	XX5
 product ABOCOM XX6		0x400b	XX6
 product ABOCOM XX7		0x400c	XX7
 product ABOCOM LCS8138TX	0x401a	LCS-8138TX
-product ABOCOM RTL8151		0x401a	RTL8151
 product ABOCOM XX8		0x4102	XX8
 product ABOCOM XX9		0x4104	XX9
 product ABOCOM UF200		0x420a	UF200 Ethernet
@@ -1197,7 +1196,6 @@ product BELKIN F6C100		0x0910	F6C100 UPS
 product BELKIN F6C120		0x0912	F6C120 UPS
 product BELKIN F6C800		0x0980	F6C800 UPS
 product BELKIN F9L1004V1	0x1004	F9L1004V1
-product BELKIN RTL8192CU_2	0x1004	RTL8192CU
 product BELKIN F6C1100		0x1100	F6C1100/1200 UPS
 product BELKIN RTL8188CU	0x1102	RTL8188CU
 product BELKIN F9L1103		0x1103	F9L1103 Wireless Adapter
@@ -1387,7 +1385,6 @@ product CONCEPTRONIC2 RT2870_8	0x3c12	RT2870
 product CONCEPTRONIC2 C54RU2	0x3c22	C54RU
 product CONCEPTRONIC2 RT2870_3	0x3c23	RT2870
 product CONCEPTRONIC2 RT2573	0x3c24	RT2573M
-product CONCEPTRONIC2 RT2870_4	0x3c25	RT2870
 product CONCEPTRONIC2 VIGORN61	0x3c25	VIGORN61
 product CONCEPTRONIC2 RT2870_5	0x3c27	RT2870
 product CONCEPTRONIC2 RT2870_6	0x3c28	RT2870
@@ -2560,8 +2557,7 @@ product	LINKSYS	WUSB11		0x2211	WUSB11 802.11b
 product	LINKSYS	WUSB11_25	0x2212	WUSB11 802.11b v2.5
 product	LINKSYS	WUSB12_11	0x2213	WUSB12 802.11b v1.1
 product LINKSYS USB10TX2	0x400b	USB10TX
-product LINKSYS2 NWU11B		0x2219	Network Everywhere NWU11B
-product LINKSYS2 WUSB11		0x2219	WUSB11
+product LINKSYS2 NWU11B		0x2219	NWU11B
 product LINKSYS2 USB200M	0x2226	USB 2.0 10/100 Ethernet controller
 product LINKSYS3 WUSB11V28	0x2233	WUSB11 v2.8
 product LINKSYS3 WUSB11V30	0x2236	WUSB11 v3.0