sync

2 files changed, 162 insertions, 162 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 522792c2acd..c4fce425391 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1883 2019/04/23 03:24:22 jsg Exp 
+ *	OpenBSD: pcidevs,v 1.1884 2019/04/23 19:19:33 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -414,18 +414,18 @@
 #define	PCI_PRODUCT_3COM_3C339	0x3390		/* 3c339 */
 #define	PCI_PRODUCT_3COM_3C359	0x3590		/* 3c359 */
 #define	PCI_PRODUCT_3COM_3C450	0x4500		/* 3c450 */
-#define	PCI_PRODUCT_3COM_3C555	0x5055		/* 3c555 100Base-TX */
+#define	PCI_PRODUCT_3COM_3C555	0x5055		/* 3c555 */
 #define	PCI_PRODUCT_3COM_3C575	0x5057		/* 3c575 */
 #define	PCI_PRODUCT_3COM_3CCFE575BT	0x5157		/* 3CCFE575BT */
 #define	PCI_PRODUCT_3COM_3CCFE575CT	0x5257		/* 3CCFE575CT */
-#define	PCI_PRODUCT_3COM_3C590	0x5900		/* 3c590 10Mbps */
-#define	PCI_PRODUCT_3COM_3C595TX	0x5950		/* 3c595 100Base-TX */
-#define	PCI_PRODUCT_3COM_3C595T4	0x5951		/* 3c595 100Base-T4 */
-#define	PCI_PRODUCT_3COM_3C595MII	0x5952		/* 3c595 10Mbps-MII */
+#define	PCI_PRODUCT_3COM_3C590	0x5900		/* 3c590 */
+#define	PCI_PRODUCT_3COM_3C595TX	0x5950		/* 3c595 */
+#define	PCI_PRODUCT_3COM_3C595T4	0x5951		/* 3c595 */
+#define	PCI_PRODUCT_3COM_3C595MII	0x5952		/* 3c595 */
 #define	PCI_PRODUCT_3COM_3CRSHPW796	0x6000		/* 3CRSHPW796 802.11b */
 #define	PCI_PRODUCT_3COM_3CRWE154G72	0x6001		/* 3CRWE154G72 802.11g */
-#define	PCI_PRODUCT_3COM_3C556	0x6055		/* 3c556 100Base-TX */
-#define	PCI_PRODUCT_3COM_3C556B	0x6056		/* 3c556B 100Base-TX */
+#define	PCI_PRODUCT_3COM_3C556	0x6055		/* 3c556 */
+#define	PCI_PRODUCT_3COM_3C556B	0x6056		/* 3c556B */
 #define	PCI_PRODUCT_3COM_3CCFEM656	0x6560		/* 3CCFEM656 */
 #define	PCI_PRODUCT_3COM_3CCFEM656B	0x6562		/* 3CCFEM656B */
 #define	PCI_PRODUCT_3COM_MODEM56	0x6563		/* 56k Modem */
@@ -434,24 +434,24 @@
 #define	PCI_PRODUCT_3COM_3CSOHO100TX	0x7646		/* 3cSOHO-TX */
 #define	PCI_PRODUCT_3COM_3CRWE777A	0x7770		/* 3crwe777a AirConnect */
 #define	PCI_PRODUCT_3COM_3C940B	0x80eb		/* 3c940B */
-#define	PCI_PRODUCT_3COM_3C900TPO	0x9000		/* 3c900 10Base-T */
-#define	PCI_PRODUCT_3COM_3C900COMBO	0x9001		/* 3c900 10Mbps-Combo */
-#define	PCI_PRODUCT_3COM_3C900B	0x9004		/* 3c900B 10Mbps */
-#define	PCI_PRODUCT_3COM_3C900BCOMBO	0x9005		/* 3c900B 10Mbps-Combo */
-#define	PCI_PRODUCT_3COM_3C900BTPC	0x9006		/* 3c900B 10Mbps-TPC */
-#define	PCI_PRODUCT_3COM_3C900BFL	0x900a		/* 3c900B 10Mbps-FL */
-#define	PCI_PRODUCT_3COM_3C905TX	0x9050		/* 3c905 100Base-TX */
-#define	PCI_PRODUCT_3COM_3C905T4	0x9051		/* 3c905 100Base-T4 */
-#define	PCI_PRODUCT_3COM_3C905BTX	0x9055		/* 3c905B 100Base-TX */
-#define	PCI_PRODUCT_3COM_3C905BT4	0x9056		/* 3c905B 100Base-T4 */
-#define	PCI_PRODUCT_3COM_3C905BCOMBO	0x9058		/* 3c905B 10/100Mbps-Combo */
-#define	PCI_PRODUCT_3COM_3C905BFX	0x905a		/* 3c905B 100Base-FX */
-#define	PCI_PRODUCT_3COM_3C905CTX	0x9200		/* 3c905C 100Base-TX */
-#define	PCI_PRODUCT_3COM_3C9201	0x9201		/* 3c9201 100Base-TX */
+#define	PCI_PRODUCT_3COM_3C900TPO	0x9000		/* 3c900 */
+#define	PCI_PRODUCT_3COM_3C900COMBO	0x9001		/* 3c900 */
+#define	PCI_PRODUCT_3COM_3C900B	0x9004		/* 3c900B */
+#define	PCI_PRODUCT_3COM_3C900BCOMBO	0x9005		/* 3c900B */
+#define	PCI_PRODUCT_3COM_3C900BTPC	0x9006		/* 3c900B */
+#define	PCI_PRODUCT_3COM_3C900BFL	0x900a		/* 3c900B */
+#define	PCI_PRODUCT_3COM_3C905TX	0x9050		/* 3c905 */
+#define	PCI_PRODUCT_3COM_3C905T4	0x9051		/* 3c905 */
+#define	PCI_PRODUCT_3COM_3C905BTX	0x9055		/* 3c905B */
+#define	PCI_PRODUCT_3COM_3C905BT4	0x9056		/* 3c905B */
+#define	PCI_PRODUCT_3COM_3C905BCOMBO	0x9058		/* 3c905B */
+#define	PCI_PRODUCT_3COM_3C905BFX	0x905a		/* 3c905B */
+#define	PCI_PRODUCT_3COM_3C905CTX	0x9200		/* 3c905C */
+#define	PCI_PRODUCT_3COM_3C9201	0x9201		/* 3c9201 */
 #define	PCI_PRODUCT_3COM_3C920BEMBW	0x9202		/* 3c920B-EMB-WNM */
-#define	PCI_PRODUCT_3COM_3CSHO100BTX	0x9300		/* 3cSOHO 100B-TX */
-#define	PCI_PRODUCT_3COM_3C980TX	0x9800		/* 3c980 100Base-TX */
-#define	PCI_PRODUCT_3COM_3C980CTX	0x9805		/* 3c980C 100Base-TX */
+#define	PCI_PRODUCT_3COM_3CSHO100BTX	0x9300		/* 3cSOHO */
+#define	PCI_PRODUCT_3COM_3C980TX	0x9800		/* 3c980 */
+#define	PCI_PRODUCT_3COM_3C980CTX	0x9805		/* 3c980C */
 #define	PCI_PRODUCT_3COM_3CR990	0x9900		/* 3cr990 */
 #define	PCI_PRODUCT_3COM_3CR990TX	0x9901		/* 3cr990-TX */
 #define	PCI_PRODUCT_3COM_3CR990TX95	0x9902		/* 3cr990-TX-95 */
@@ -488,23 +488,23 @@
 #define	PCI_PRODUCT_3DLABS_WILDCAT_7210	0x07a3		/* Wildcat IV 7210 */
 
 /* 3ware products */
-#define	PCI_PRODUCT_3WARE_ESCALADE	0x1000		/* 5000/6000 series RAID */
-#define	PCI_PRODUCT_3WARE_ESCALADE_ASIC	0x1001		/* 7000/8000 series RAID */
-#define	PCI_PRODUCT_3WARE_9000	0x1002		/* 9000 series RAID */
-#define	PCI_PRODUCT_3WARE_9500	0x1003		/* 9500 series RAID */
+#define	PCI_PRODUCT_3WARE_ESCALADE	0x1000		/* 5000/6000 RAID */
+#define	PCI_PRODUCT_3WARE_ESCALADE_ASIC	0x1001		/* 7000/8000 RAID */
+#define	PCI_PRODUCT_3WARE_9000	0x1002		/* 9000 RAID */
+#define	PCI_PRODUCT_3WARE_9500	0x1003		/* 9500 RAID */
 
 /* Abocom products */
-#define	PCI_PRODUCT_ABOCOM_FE2500	0xab02		/* FE2500 10/100 */
-#define	PCI_PRODUCT_ABOCOM_PCM200	0xab03		/* PCM200 10/100 */
-#define	PCI_PRODUCT_ABOCOM_FE2000VX	0xab06		/* FE2000VX 10/100 */
-#define	PCI_PRODUCT_ABOCOM_FE2500MX	0xab08		/* FE2500MX 10/100 */
+#define	PCI_PRODUCT_ABOCOM_FE2500	0xab02		/* FE2500 */
+#define	PCI_PRODUCT_ABOCOM_PCM200	0xab03		/* PCM200 */
+#define	PCI_PRODUCT_ABOCOM_FE2000VX	0xab06		/* FE2000VX */
+#define	PCI_PRODUCT_ABOCOM_FE2500MX	0xab08		/* FE2500MX */
 
 /* Aironet Products */
-#define	PCI_PRODUCT_AIRONET_PC4800_1	0x0001		/* PC4800 Wireless */
-#define	PCI_PRODUCT_AIRONET_PCI352	0x0350		/* PCI35x WLAN */
-#define	PCI_PRODUCT_AIRONET_PC4500	0x4500		/* PC4500 Wireless */
-#define	PCI_PRODUCT_AIRONET_PC4800	0x4800		/* PC4800 Wireless */
-#define	PCI_PRODUCT_AIRONET_MPI350	0xa504		/* MPI-350 Wireless */
+#define	PCI_PRODUCT_AIRONET_PC4800_1	0x0001		/* PC4800 */
+#define	PCI_PRODUCT_AIRONET_PCI352	0x0350		/* PCI35x */
+#define	PCI_PRODUCT_AIRONET_PC4500	0x4500		/* PC4500 */
+#define	PCI_PRODUCT_AIRONET_PC4800	0x4800		/* PC4800 */
+#define	PCI_PRODUCT_AIRONET_MPI350	0xa504		/* MPI-350 */
 
 /* ACC Products */
 #define	PCI_PRODUCT_ACC_2188	0x0000		/* ACCM 2188 VL-PCI */
@@ -590,7 +590,7 @@
 #define	PCI_PRODUCT_ADMTEK_AL981	0x0981		/* AL981 */
 #define	PCI_PRODUCT_ADMTEK_AN983	0x0985		/* AN983 */
 #define	PCI_PRODUCT_ADMTEK_AN985	0x1985		/* AN985 */
-#define	PCI_PRODUCT_ADMTEK_ADM8211	0x8201		/* ADM8211 WLAN */
+#define	PCI_PRODUCT_ADMTEK_ADM8211	0x8201		/* ADM8211 */
 #define	PCI_PRODUCT_ADMTEK_ADM9511	0x9511		/* ADM9511 */
 #define	PCI_PRODUCT_ADMTEK_ADM9513	0x9513		/* ADM9513 */
 
@@ -2552,18 +2552,18 @@
 #define	PCI_PRODUCT_COMPAQ_SMART2P	0xae10		/* SMART2P RAID */
 #define	PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE3	0xae29		/* ISA */
 #define	PCI_PRODUCT_COMPAQ_PCI_ISAPNP	0xae2b		/* ISAPnP */
-#define	PCI_PRODUCT_COMPAQ_N100TX	0xae32		/* Netelligent 10/100TX */
+#define	PCI_PRODUCT_COMPAQ_N100TX	0xae32		/* Netelligent */
 #define	PCI_PRODUCT_COMPAQ_IDE	0xae33		/* Netelligent IDE */
 #define	PCI_PRODUCT_COMPAQ_N10T	0xae34		/* Netelligent 10 T */
 #define	PCI_PRODUCT_COMPAQ_IntNF3P	0xae35		/* Integrated NetFlex 3/P */
-#define	PCI_PRODUCT_COMPAQ_DPNet100TX	0xae40		/* DP Netelligent 10/100TX */
-#define	PCI_PRODUCT_COMPAQ_IntPL100TX	0xae43		/* ProLiant Netelligent 10/100TX */
+#define	PCI_PRODUCT_COMPAQ_DPNet100TX	0xae40		/* DP Netelligent */
+#define	PCI_PRODUCT_COMPAQ_IntPL100TX	0xae43		/* ProLiant Netelligent */
 #define	PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE2	0xae69		/* ISA */
 #define	PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE1	0xae6c		/* PCI */
 #define	PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE2	0xae6d		/* PCI */
-#define	PCI_PRODUCT_COMPAQ_DP4000	0xb011		/* Embedded Netelligent 10/100TX */
+#define	PCI_PRODUCT_COMPAQ_DP4000	0xb011		/* Embedded Netelligent */
 #define	PCI_PRODUCT_COMPAQ_N10T2	0xb012		/* Netelligent 10 T/2 PCI */
-#define	PCI_PRODUCT_COMPAQ_N10_TX_UTP	0xb030		/* Netelligent 10/100TX */
+#define	PCI_PRODUCT_COMPAQ_N10_TX_UTP	0xb030		/* Netelligent */
 #define	PCI_PRODUCT_COMPAQ_CSA5300_2	0xb060		/* Smart Array 5300 rev.2 */
 #define	PCI_PRODUCT_COMPAQ_CSA5i_2	0xb178		/* Smart Array 5i/532 rev.2 */
 #define	PCI_PRODUCT_COMPAQ_ILO_1	0xb203		/* iLO */
@@ -2573,14 +2573,14 @@
 
 /* Compex */
 #define	PCI_PRODUCT_COMPEX_COMPEXE	0x1401		/* Compexe */
-#define	PCI_PRODUCT_COMPEX_RL100ATX	0x2011		/* RL100-ATX 10/100 */
+#define	PCI_PRODUCT_COMPEX_RL100ATX	0x2011		/* RL100-ATX */
 #define	PCI_PRODUCT_COMPEX_98713	0x9881		/* PMAC 98713 */
 
 /* Conexant products */
 #define	PCI_PRODUCT_CONEXANT_56K_WINMODEM	0x1033		/* 56k Winmodem */
 #define	PCI_PRODUCT_CONEXANT_56K_WINMODEM2	0x1036		/* 56k Winmodem */
-#define	PCI_PRODUCT_CONEXANT_RS7112	0x1803		/* 10/100 */
-#define	PCI_PRODUCT_CONEXANT_56K_WINMODEM3	0x1804		/* 10/100 */
+#define	PCI_PRODUCT_CONEXANT_RS7112	0x1803		/* RS7112 */
+#define	PCI_PRODUCT_CONEXANT_56K_WINMODEM3	0x1804		/* 56k Winmodem */
 #define	PCI_PRODUCT_CONEXANT_SOFTK56_PCI	0x2443		/* SoftK56 PCI */
 #define	PCI_PRODUCT_CONEXANT_HSF_56K_HSFI	0x2f00		/* HSF 56k HSFi */
 #define	PCI_PRODUCT_CONEXANT_MUSYCC8478	0x8478		/* MUSYCC CN8478 */
@@ -2599,8 +2599,8 @@
 #define	PCI_PRODUCT_CONTAQ_82C693	0xc693		/* CY82C693U ISA */
 
 /* Corega products */
-#define	PCI_PRODUCT_COREGA_CB_TXD	0xa117		/* FEther CB-TXD 10/100 */
-#define	PCI_PRODUCT_COREGA_2CB_TXD	0xa11e		/* FEther II CB-TXD 10/100 */
+#define	PCI_PRODUCT_COREGA_CB_TXD	0xa117		/* FEther CB-TXD */
+#define	PCI_PRODUCT_COREGA_2CB_TXD	0xa11e		/* FEther II CB-TXD */
 #define	PCI_PRODUCT_COREGA_CGLAPCIGT	0xc107		/* CG-LAPCIGT */
 #define	PCI_PRODUCT_COREGA2_RTL8192E_1	0x0044		/* RTL8192E */
 #define	PCI_PRODUCT_COREGA2_RTL8190P_1	0x0045		/* RTL8190P */
@@ -2930,7 +2930,7 @@
 #define	PCI_PRODUCT_HAUPPAUGE_WINTV	0x13eb		/* WinTV */
 
 /* Hawking products */
-#define	PCI_PRODUCT_HAWKING_PN672TX	0xab08		/* PN672TX 10/100 */
+#define	PCI_PRODUCT_HAWKING_PN672TX	0xab08		/* PN672TX */
 
 /* Hewlett-Packard products */
 #define	PCI_PRODUCT_HP_VISUALIZE_EG	0x1005		/* Visualize EG */
@@ -2947,7 +2947,7 @@
 #define	PCI_PRODUCT_HP_TOPTOOLS	0x10c1		/* TopTools */
 #define	PCI_PRODUCT_HP_NETRAID_4M	0x10c2		/* NetRaid-4M */
 #define	PCI_PRODUCT_HP_SMARTIRQ	0x10ed		/* NetServer SmartIRQ */
-#define	PCI_PRODUCT_HP_82557B	0x1200		/* 82557B 10/100 NIC */
+#define	PCI_PRODUCT_HP_82557B	0x1200		/* 82557B NIC */
 #define	PCI_PRODUCT_HP_PLUTO	0x1229		/* Pluto MIO */
 #define	PCI_PRODUCT_HP_ZX1_IOC	0x122a		/* zx1 IOC */
 #define	PCI_PRODUCT_HP_MERCURY	0x122e		/* Mercury Ropes-PCI */
@@ -3066,7 +3066,7 @@
 #define	PCI_PRODUCT_IBM_SERVERAID	0x002e		/* ServeRAID */
 #define	PCI_PRODUCT_IBM_MIAMI	0x0036		/* Miami/PCI */
 #define	PCI_PRODUCT_IBM_OLYMPIC	0x003e		/* Olympic */
-#define	PCI_PRODUCT_IBM_I82557B	0x0057		/* i82557B 10/100 */
+#define	PCI_PRODUCT_IBM_I82557B	0x0057		/* i82557B */
 #define	PCI_PRODUCT_IBM_RSA	0x010f		/* RSA */
 #define	PCI_PRODUCT_IBM_FIREGL2	0x0170		/* FireGL2 */
 #define	PCI_PRODUCT_IBM_133PCIX	0x01a7		/* 133 PCIX-PCIX */
@@ -5693,7 +5693,7 @@
 #define	PCI_PRODUCT_MARVELL_88W8335_1	0x1faa		/* Libertas 88W8335 */
 #define	PCI_PRODUCT_MARVELL_88W8335_2	0x1fab		/* Libertas 88W8335 */
 #define	PCI_PRODUCT_MARVELL_88W8300_2	0x2a01		/* Libertas 88W8300 */
-#define	PCI_PRODUCT_MARVELL_88W8897	0x2b38		/* 88W8897 802.11ac Wireless */
+#define	PCI_PRODUCT_MARVELL_88W8897	0x2b38		/* 88W8897 802.11ac */
 #define	PCI_PRODUCT_MARVELL_YUKON	0x4320		/* Yukon 88E8001/8003/8010 */
 #define	PCI_PRODUCT_MARVELL_YUKON_8021CU	0x4340		/* Yukon 88E8021CU */
 #define	PCI_PRODUCT_MARVELL_YUKON_8022CU	0x4341		/* Yukon 88E8022CU */
@@ -5812,15 +5812,15 @@
 #define	PCI_PRODUCT_MENTOR_PCI0661	0x0661		/* PCI-PCI */
 
 /* Micrel products */
-#define	PCI_PRODUCT_MICREL_KSZ8841	0x8841		/* KSZ8841 10/100 */
-#define	PCI_PRODUCT_MICREL_KSZ8842	0x8842		/* KSZ8842 dual-port 10/100 switch */
+#define	PCI_PRODUCT_MICREL_KSZ8841	0x8841		/* KSZ8841 */
+#define	PCI_PRODUCT_MICREL_KSZ8842	0x8842		/* KSZ8842 */
 
 /* Micro Star International products */
 #define	PCI_PRODUCT_MSI_RT3090	0x891a		/* RT3090 */
 
 /* Microsoft products */
-#define	PCI_PRODUCT_MICROSOFT_MN120	0x0001		/* MN-120 10/100 */
-#define	PCI_PRODUCT_MICROSOFT_MN130	0x0002		/* MN-130 10/100 */
+#define	PCI_PRODUCT_MICROSOFT_MN120	0x0001		/* MN-120 */
+#define	PCI_PRODUCT_MICROSOFT_MN130	0x0002		/* MN-130 */
 #define	PCI_PRODUCT_MICROSOFT_VGA	0x5353		/* VGA */
 
 /* Miro Computer Products AG */
@@ -5868,9 +5868,9 @@
 #define	PCI_PRODUCT_MYRICOM_LANAI_92	0x8043		/* Myrinet LANai 9.2 */
 
 /* Myson Century products */
-#define	PCI_PRODUCT_MYSON_MTD800	0x0800		/* MTD800 10/100 */
-#define	PCI_PRODUCT_MYSON_MTD803	0x0803		/* MTD803 10/100 */
-#define	PCI_PRODUCT_MYSON_MTD891	0x0891		/* MTD891 10/100/1000 */
+#define	PCI_PRODUCT_MYSON_MTD800	0x0800		/* MTD800 */
+#define	PCI_PRODUCT_MYSON_MTD803	0x0803		/* MTD803 */
+#define	PCI_PRODUCT_MYSON_MTD891	0x0891		/* MTD891 */
 
 /* Mutech products */
 #define	PCI_PRODUCT_MUTECH_MV1000	0x0001		/* MV1000 */
@@ -5905,12 +5905,12 @@
 #define	PCI_PRODUCT_NETXEN_NX3031	0x0100		/* NX3031 */
 
 /* National Semiconductor products */
-#define	PCI_PRODUCT_NS_DP83810	0x0001		/* DP83810 10/100 */
+#define	PCI_PRODUCT_NS_DP83810	0x0001		/* DP83810 */
 #define	PCI_PRODUCT_NS_PC87415	0x0002		/* PC87415 IDE */
 #define	PCI_PRODUCT_NS_PC87560	0x000e		/* 87560 Legacy I/O */
 #define	PCI_PRODUCT_NS_USB	0x0012		/* USB */
-#define	PCI_PRODUCT_NS_DP83815	0x0020		/* DP83815 10/100 */
-#define	PCI_PRODUCT_NS_DP83820	0x0022		/* DP83820 10/100/1000 */
+#define	PCI_PRODUCT_NS_DP83815	0x0020		/* DP83815 */
+#define	PCI_PRODUCT_NS_DP83820	0x0022		/* DP83820 */
 #define	PCI_PRODUCT_NS_CS5535_HB	0x0028		/* CS5535 Host */
 #define	PCI_PRODUCT_NS_CS5535_ISA	0x002b		/* CS5535 ISA */
 #define	PCI_PRODUCT_NS_CS5535_IDE	0x002d		/* CS5535 IDE */
@@ -6150,8 +6150,8 @@
 #define	PCI_PRODUCT_PERICOM_PI7C9X130	0xe130		/* PI7C9X130 PCIE-PCIX */
 
 /* Planex products */
-#define	PCI_PRODUCT_PLANEX_FNW_3603_TX	0xab06		/* FNW-3603-TX 10/100 */
-#define	PCI_PRODUCT_PLANEX_FNW_3800_TX	0xab07		/* FNW-3800-TX 10/100 */
+#define	PCI_PRODUCT_PLANEX_FNW_3603_TX	0xab06		/* FNW-3603-TX */
+#define	PCI_PRODUCT_PLANEX_FNW_3800_TX	0xab07		/* FNW-3800-TX */
 
 /* NexGen products */
 #define	PCI_PRODUCT_NEXGEN_NX82C501	0x4e78		/* NX82C501 PCI */
@@ -6160,8 +6160,8 @@
 #define	PCI_PRODUCT_NKK_NDR4600	0xa001		/* NDR4600 PCI */
 
 /* Nortel Networks products */
-#define	PCI_PRODUCT_NORTEL_BS21	0x1211		/* BS21 10/100 */
-#define	PCI_PRODUCT_NORTEL_211818A	0x8030		/* E-mobility Wireless */
+#define	PCI_PRODUCT_NORTEL_BS21	0x1211		/* BS21 */
+#define	PCI_PRODUCT_NORTEL_211818A	0x8030		/* E-mobility */
 
 /* Number Nine products */
 #define	PCI_PRODUCT_NUMBER9_I128	0x2309		/* Imagine-128 */
@@ -7111,7 +7111,7 @@
 #define	PCI_PRODUCT_RDC_R1011_IDE	0x1011		/* R1011 IDE */
 #define	PCI_PRODUCT_RDC_R1012_IDE	0x1012		/* R1012 IDE */
 #define	PCI_PRODUCT_RDC_R1031_PCIE	0x1031		/* R1031 PCIe */
-#define	PCI_PRODUCT_RDC_R1060_USBD	0x1060		/* R1060 USB Device */
+#define	PCI_PRODUCT_RDC_R1060_USBD	0x1060		/* R1060 USB */
 #define	PCI_PRODUCT_RDC_R1070_CAN	0x1070		/* R1070 CAN */
 #define	PCI_PRODUCT_RDC_R1331_MC	0x1331		/* R1331 MC */
 #define	PCI_PRODUCT_RDC_R1710_SPI	0x1710		/* R1710 SPI */
@@ -7373,7 +7373,7 @@
 #define	PCI_PRODUCT_SIS_756	0x0756		/* 756 PCI */
 #define	PCI_PRODUCT_SIS_760	0x0760		/* 760 PCI */
 #define	PCI_PRODUCT_SIS_761	0x0761		/* 761 PCI */
-#define	PCI_PRODUCT_SIS_900	0x0900		/* 900 10/100BaseTX */
+#define	PCI_PRODUCT_SIS_900	0x0900		/* 900 */
 #define	PCI_PRODUCT_SIS_961	0x0961		/* 961 ISA */
 #define	PCI_PRODUCT_SIS_962	0x0962		/* 962 ISA */
 #define	PCI_PRODUCT_SIS_963	0x0963		/* 963 ISA */
@@ -7409,7 +7409,7 @@
 #define	PCI_PRODUCT_SIS_7007	0x7007		/* 7007 FireWire */
 #define	PCI_PRODUCT_SIS_7012_ACA	0x7012		/* 7012 AC97 */
 #define	PCI_PRODUCT_SIS_7013	0x7013		/* 7013 Modem */
-#define	PCI_PRODUCT_SIS_7016	0x7016		/* 7016 10/100BaseTX */
+#define	PCI_PRODUCT_SIS_7016	0x7016		/* 7016 */
 #define	PCI_PRODUCT_SIS_7018	0x7018		/* 7018 Audio */
 #define	PCI_PRODUCT_SIS_7019	0x7019		/* 7019 Audio */
 #define	PCI_PRODUCT_SIS_7300	0x7300		/* 7300 VGA */
@@ -7461,7 +7461,7 @@
 #define	PCI_PRODUCT_SUN_EBUS	0x1000		/* PCIO EBus2 */
 #define	PCI_PRODUCT_SUN_HME	0x1001		/* HME */
 #define	PCI_PRODUCT_SUN_RIO_EBUS	0x1100		/* RIO EBus */
-#define	PCI_PRODUCT_SUN_ERINETWORK	0x1101		/* ERI Ether */
+#define	PCI_PRODUCT_SUN_ERINETWORK	0x1101		/* ERI */
 #define	PCI_PRODUCT_SUN_FIREWIRE	0x1102		/* FireWire */
 #define	PCI_PRODUCT_SUN_USB	0x1103		/* USB */
 #define	PCI_PRODUCT_SUN_GEMNETWORK	0x2bad		/* GEM */
@@ -7514,8 +7514,8 @@
 #define	PCI_PRODUCT_TTTECH_MC322	0x000a		/* MC322 */
 
 /* Tamarack Microelectronics */
-#define	PCI_PRODUCT_TAMARACK_TC9021	0x1021		/* TC9021 GigE */
-#define	PCI_PRODUCT_TAMARACK_TC9021_ALT	0x9021		/* TC9021 GigE */
+#define	PCI_PRODUCT_TAMARACK_TC9021	0x1021		/* TC9021 */
+#define	PCI_PRODUCT_TAMARACK_TC9021_ALT	0x9021		/* TC9021 */
 
 /* Techsan Electronics */
 #define	PCI_PRODUCT_TECHSAN_B2C2_SKY2PC	0x2104		/* B2C2 Sky2PC */
@@ -8114,7 +8114,7 @@
 
 /* Winbond Electronics products */
 #define	PCI_PRODUCT_WINBOND_W83769F	0x0001		/* W83769F */
-#define	PCI_PRODUCT_WINBOND_W89C840F	0x0840		/* W89C840F 10/100 */
+#define	PCI_PRODUCT_WINBOND_W89C840F	0x0840		/* W89C840F */
 #define	PCI_PRODUCT_WINBOND_W89C940F	0x0940		/* Linksys EtherPCI II */
 #define	PCI_PRODUCT_WINBOND_W83C553F_0	0x0565		/* W83C553F ISA */
 #define	PCI_PRODUCT_WINBOND_W83C553F_1	0x0105		/* W83C553F */
@@ -8139,13 +8139,13 @@
 /* Xircom products */
 #define	PCI_PRODUCT_XIRCOM_X3201_3	0x0002		/* X3201-3 */
 #define	PCI_PRODUCT_XIRCOM_X3201_3_21143	0x0003		/* X3201-3 */
-#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_1	0x0005		/* CardBus Ethernet */
-#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_2	0x0007		/* CardBus Ethernet */
-#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_3	0x000b		/* CardBus Ethernet */
-#define	PCI_PRODUCT_XIRCOM_MPCI_MODEM_V90	0x000c		/* Mini-PCI V.90 56k Modem */
-#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_4	0x000f		/* CardBus Ethernet */
-#define	PCI_PRODUCT_XIRCOM_MPCI_MODEM_K56	0x00d4		/* Mini-PCI K56Flex Modem */
-#define	PCI_PRODUCT_XIRCOM_MODEM_56K	0x0101		/* CardBus 56k Modem */
+#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_1	0x0005		/* Ethernet */
+#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_2	0x0007		/* Ethernet */
+#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_3	0x000b		/* Ethernet */
+#define	PCI_PRODUCT_XIRCOM_MPCI_MODEM_V90	0x000c		/* V.90 56k Modem */
+#define	PCI_PRODUCT_XIRCOM_CARDBUS_ETH_4	0x000f		/* Ethernet */
+#define	PCI_PRODUCT_XIRCOM_MPCI_MODEM_K56	0x00d4		/* K56Flex Modem */
+#define	PCI_PRODUCT_XIRCOM_MODEM_56K	0x0101		/* 56k Modem */
 #define	PCI_PRODUCT_XIRCOM_MODEM56	0x0103		/* 56k Modem */
 #define	PCI_PRODUCT_XIRCOM_CBEM56G	0x0105		/* CBEM56G Modem */
 
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 9b324fae617..e7d06ebdc01 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1883 2019/04/23 03:24:22 jsg Exp 
+ *	OpenBSD: pcidevs,v 1.1884 2019/04/23 19:19:33 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -165,7 +165,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C555,
-	    "3c555 100Base-TX",
+	    "3c555",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C575,
@@ -181,19 +181,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C590,
-	    "3c590 10Mbps",
+	    "3c590",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595TX,
-	    "3c595 100Base-TX",
+	    "3c595",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595T4,
-	    "3c595 100Base-T4",
+	    "3c595",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595MII,
-	    "3c595 10Mbps-MII",
+	    "3c595",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CRSHPW796,
@@ -205,11 +205,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C556,
-	    "3c556 100Base-TX",
+	    "3c556",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C556B,
-	    "3c556B 100Base-TX",
+	    "3c556B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CCFEM656,
@@ -245,59 +245,59 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900TPO,
-	    "3c900 10Base-T",
+	    "3c900",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900COMBO,
-	    "3c900 10Mbps-Combo",
+	    "3c900",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900B,
-	    "3c900B 10Mbps",
+	    "3c900B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900BCOMBO,
-	    "3c900B 10Mbps-Combo",
+	    "3c900B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900BTPC,
-	    "3c900B 10Mbps-TPC",
+	    "3c900B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900BFL,
-	    "3c900B 10Mbps-FL",
+	    "3c900B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905TX,
-	    "3c905 100Base-TX",
+	    "3c905",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905T4,
-	    "3c905 100Base-T4",
+	    "3c905",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905BTX,
-	    "3c905B 100Base-TX",
+	    "3c905B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905BT4,
-	    "3c905B 100Base-T4",
+	    "3c905B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905BCOMBO,
-	    "3c905B 10/100Mbps-Combo",
+	    "3c905B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905BFX,
-	    "3c905B 100Base-FX",
+	    "3c905B",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905CTX,
-	    "3c905C 100Base-TX",
+	    "3c905C",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C9201,
-	    "3c9201 100Base-TX",
+	    "3c9201",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C920BEMBW,
@@ -305,15 +305,15 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CSHO100BTX,
-	    "3cSOHO 100B-TX",
+	    "3cSOHO",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C980TX,
-	    "3c980 100Base-TX",
+	    "3c980",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C980CTX,
-	    "3c980C 100Base-TX",
+	    "3c980C",
 	},
 	{
 	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CR990,
@@ -433,55 +433,55 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_3WARE, PCI_PRODUCT_3WARE_ESCALADE,
-	    "5000/6000 series RAID",
+	    "5000/6000 RAID",
 	},
 	{
 	    PCI_VENDOR_3WARE, PCI_PRODUCT_3WARE_ESCALADE_ASIC,
-	    "7000/8000 series RAID",
+	    "7000/8000 RAID",
 	},
 	{
 	    PCI_VENDOR_3WARE, PCI_PRODUCT_3WARE_9000,
-	    "9000 series RAID",
+	    "9000 RAID",
 	},
 	{
 	    PCI_VENDOR_3WARE, PCI_PRODUCT_3WARE_9500,
-	    "9500 series RAID",
+	    "9500 RAID",
 	},
 	{
 	    PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2500,
-	    "FE2500 10/100",
+	    "FE2500",
 	},
 	{
 	    PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_PCM200,
-	    "PCM200 10/100",
+	    "PCM200",
 	},
 	{
 	    PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2000VX,
-	    "FE2000VX 10/100",
+	    "FE2000VX",
 	},
 	{
 	    PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2500MX,
-	    "FE2500MX 10/100",
+	    "FE2500MX",
 	},
 	{
 	    PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PC4800_1,
-	    "PC4800 Wireless",
+	    "PC4800",
 	},
 	{
 	    PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PCI352,
-	    "PCI35x WLAN",
+	    "PCI35x",
 	},
 	{
 	    PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PC4500,
-	    "PC4500 Wireless",
+	    "PC4500",
 	},
 	{
 	    PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PC4800,
-	    "PC4800 Wireless",
+	    "PC4800",
 	},
 	{
 	    PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_MPI350,
-	    "MPI-350 Wireless",
+	    "MPI-350",
 	},
 	{
 	    PCI_VENDOR_ACC, PCI_PRODUCT_ACC_2188,
@@ -769,7 +769,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_ADM8211,
-	    "ADM8211 WLAN",
+	    "ADM8211",
 	},
 	{
 	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_ADM9511,
@@ -8185,7 +8185,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_N100TX,
-	    "Netelligent 10/100TX",
+	    "Netelligent",
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_IDE,
@@ -8201,11 +8201,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DPNet100TX,
-	    "DP Netelligent 10/100TX",
+	    "DP Netelligent",
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_IntPL100TX,
-	    "ProLiant Netelligent 10/100TX",
+	    "ProLiant Netelligent",
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE2,
@@ -8221,7 +8221,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DP4000,
-	    "Embedded Netelligent 10/100TX",
+	    "Embedded Netelligent",
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_N10T2,
@@ -8229,7 +8229,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_N10_TX_UTP,
-	    "Netelligent 10/100TX",
+	    "Netelligent",
 	},
 	{
 	    PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5300_2,
@@ -8261,7 +8261,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_COMPEX, PCI_PRODUCT_COMPEX_RL100ATX,
-	    "RL100-ATX 10/100",
+	    "RL100-ATX",
 	},
 	{
 	    PCI_VENDOR_COMPEX, PCI_PRODUCT_COMPEX_98713,
@@ -8277,11 +8277,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_RS7112,
-	    "10/100",
+	    "RS7112",
 	},
 	{
 	    PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM3,
-	    "10/100",
+	    "56k Winmodem",
 	},
 	{
 	    PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_SOFTK56_PCI,
@@ -8341,11 +8341,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_CB_TXD,
-	    "FEther CB-TXD 10/100",
+	    "FEther CB-TXD",
 	},
 	{
 	    PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_2CB_TXD,
-	    "FEther II CB-TXD 10/100",
+	    "FEther II CB-TXD",
 	},
 	{
 	    PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_CGLAPCIGT,
@@ -9325,7 +9325,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_HAWKING, PCI_PRODUCT_HAWKING_PN672TX,
-	    "PN672TX 10/100",
+	    "PN672TX",
 	},
 	{
 	    PCI_VENDOR_HP, PCI_PRODUCT_HP_VISUALIZE_EG,
@@ -9385,7 +9385,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_HP, PCI_PRODUCT_HP_82557B,
-	    "82557B 10/100 NIC",
+	    "82557B NIC",
 	},
 	{
 	    PCI_VENDOR_HP, PCI_PRODUCT_HP_PLUTO,
@@ -9813,7 +9813,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_IBM, PCI_PRODUCT_IBM_I82557B,
-	    "i82557B 10/100",
+	    "i82557B",
 	},
 	{
 	    PCI_VENDOR_IBM, PCI_PRODUCT_IBM_RSA,
@@ -20073,7 +20073,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8897,
-	    "88W8897 802.11ac Wireless",
+	    "88W8897 802.11ac",
 	},
 	{
 	    PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON,
@@ -20501,11 +20501,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_MICREL, PCI_PRODUCT_MICREL_KSZ8841,
-	    "KSZ8841 10/100",
+	    "KSZ8841",
 	},
 	{
 	    PCI_VENDOR_MICREL, PCI_PRODUCT_MICREL_KSZ8842,
-	    "KSZ8842 dual-port 10/100 switch",
+	    "KSZ8842",
 	},
 	{
 	    PCI_VENDOR_MSI, PCI_PRODUCT_MSI_RT3090,
@@ -20513,11 +20513,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_MICROSOFT, PCI_PRODUCT_MICROSOFT_MN120,
-	    "MN-120 10/100",
+	    "MN-120",
 	},
 	{
 	    PCI_VENDOR_MICROSOFT, PCI_PRODUCT_MICROSOFT_MN130,
-	    "MN-130 10/100",
+	    "MN-130",
 	},
 	{
 	    PCI_VENDOR_MICROSOFT, PCI_PRODUCT_MICROSOFT_VGA,
@@ -20637,15 +20637,15 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_MYSON, PCI_PRODUCT_MYSON_MTD800,
-	    "MTD800 10/100",
+	    "MTD800",
 	},
 	{
 	    PCI_VENDOR_MYSON, PCI_PRODUCT_MYSON_MTD803,
-	    "MTD803 10/100",
+	    "MTD803",
 	},
 	{
 	    PCI_VENDOR_MYSON, PCI_PRODUCT_MYSON_MTD891,
-	    "MTD891 10/100/1000",
+	    "MTD891",
 	},
 	{
 	    PCI_VENDOR_MUTECH, PCI_PRODUCT_MUTECH_MV1000,
@@ -20721,7 +20721,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_NS, PCI_PRODUCT_NS_DP83810,
-	    "DP83810 10/100",
+	    "DP83810",
 	},
 	{
 	    PCI_VENDOR_NS, PCI_PRODUCT_NS_PC87415,
@@ -20737,11 +20737,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_NS, PCI_PRODUCT_NS_DP83815,
-	    "DP83815 10/100",
+	    "DP83815",
 	},
 	{
 	    PCI_VENDOR_NS, PCI_PRODUCT_NS_DP83820,
-	    "DP83820 10/100/1000",
+	    "DP83820",
 	},
 	{
 	    PCI_VENDOR_NS, PCI_PRODUCT_NS_CS5535_HB,
@@ -21573,11 +21573,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_PLANEX, PCI_PRODUCT_PLANEX_FNW_3603_TX,
-	    "FNW-3603-TX 10/100",
+	    "FNW-3603-TX",
 	},
 	{
 	    PCI_VENDOR_PLANEX, PCI_PRODUCT_PLANEX_FNW_3800_TX,
-	    "FNW-3800-TX 10/100",
+	    "FNW-3800-TX",
 	},
 	{
 	    PCI_VENDOR_NEXGEN, PCI_PRODUCT_NEXGEN_NX82C501,
@@ -21589,11 +21589,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_NORTEL, PCI_PRODUCT_NORTEL_BS21,
-	    "BS21 10/100",
+	    "BS21",
 	},
 	{
 	    PCI_VENDOR_NORTEL, PCI_PRODUCT_NORTEL_211818A,
-	    "E-mobility Wireless",
+	    "E-mobility",
 	},
 	{
 	    PCI_VENDOR_NUMBER9, PCI_PRODUCT_NUMBER9_I128,
@@ -25137,7 +25137,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R1060_USBD,
-	    "R1060 USB Device",
+	    "R1060 USB",
 	},
 	{
 	    PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R1070_CAN,
@@ -26041,7 +26041,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_900,
-	    "900 10/100BaseTX",
+	    "900",
 	},
 	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_961,
@@ -26185,7 +26185,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7016,
-	    "7016 10/100BaseTX",
+	    "7016",
 	},
 	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7018,
@@ -26329,7 +26329,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_SUN, PCI_PRODUCT_SUN_ERINETWORK,
-	    "ERI Ether",
+	    "ERI",
 	},
 	{
 	    PCI_VENDOR_SUN, PCI_PRODUCT_SUN_FIREWIRE,
@@ -26477,11 +26477,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_TAMARACK, PCI_PRODUCT_TAMARACK_TC9021,
-	    "TC9021 GigE",
+	    "TC9021",
 	},
 	{
 	    PCI_VENDOR_TAMARACK, PCI_PRODUCT_TAMARACK_TC9021_ALT,
-	    "TC9021 GigE",
+	    "TC9021",
 	},
 	{
 	    PCI_VENDOR_TECHSAN, PCI_PRODUCT_TECHSAN_B2C2_SKY2PC,
@@ -28645,7 +28645,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W89C840F,
-	    "W89C840F 10/100",
+	    "W89C840F",
 	},
 	{
 	    PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W89C940F,
@@ -28705,31 +28705,31 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CARDBUS_ETH_1,
-	    "CardBus Ethernet",
+	    "Ethernet",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CARDBUS_ETH_2,
-	    "CardBus Ethernet",
+	    "Ethernet",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CARDBUS_ETH_3,
-	    "CardBus Ethernet",
+	    "Ethernet",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MPCI_MODEM_V90,
-	    "Mini-PCI V.90 56k Modem",
+	    "V.90 56k Modem",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CARDBUS_ETH_4,
-	    "CardBus Ethernet",
+	    "Ethernet",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MPCI_MODEM_K56,
-	    "Mini-PCI K56Flex Modem",
+	    "K56Flex Modem",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM_56K,
-	    "CardBus 56k Modem",
+	    "56k Modem",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM56,