From: deraadt <deraadt@openbsd.org>
Date: Sun, 18 Apr 2021 00:21:58 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2247d090e6e10bc9c1cfee58d9f3d36b89718fe0;p=openbsd

sync
---

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index aa148a90ef5..0596b1df94c 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.1966 2021/04/18 00:17:22 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.1967 2021/04/18 00:21:53 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -2939,7 +2939,7 @@
 /* ENE Technology products */
 #define	PCI_PRODUCT_ENE_FLASH	0x0520		/* Flash memory */
 #define	PCI_PRODUCT_ENE_MEMSTICK	0x0530		/* Memory Stick */
-#define	PCI_PRODUCT_ENE_SDCARD	0x0550		/* SD Controller */
+#define	PCI_PRODUCT_ENE_SDCARD	0x0550		/* SD */
 #define	PCI_PRODUCT_ENE_SDMMC	0x0551		/* SD/MMC */
 #define	PCI_PRODUCT_ENE_CB1211	0x1211		/* CB-1211 CardBus */
 #define	PCI_PRODUCT_ENE_CB1225	0x1225		/* CB-1225 CardBus */
@@ -8407,7 +8407,7 @@
 #define	PCI_PRODUCT_TOSHIBA2_TOPIC97	0x060f		/* ToPIC97 CardBus */
 #define	PCI_PRODUCT_TOSHIBA2_TOPIC100	0x0617		/* ToPIC100 CardBus */
 #define	PCI_PRODUCT_TOSHIBA2_TFIRO	0x0701		/* Infrared */
-#define	PCI_PRODUCT_TOSHIBA2_SDCARD	0x0805		/* SD Controller */
+#define	PCI_PRODUCT_TOSHIBA2_SDCARD	0x0805		/* SD */
 
 /* Transmeta products */
 #define	PCI_PRODUCT_TRANSMETA_NB	0x0295		/* Northbridge */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index bb1f77d5288..25b553e8288 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.1966 2021/04/18 00:17:22 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.1967 2021/04/18 00:21:53 deraadt Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -9449,7 +9449,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ENE, PCI_PRODUCT_ENE_SDCARD,
-	    "SD Controller",
+	    "SD",
 	},
 	{
 	    PCI_VENDOR_ENE, PCI_PRODUCT_ENE_SDMMC,
@@ -29905,7 +29905,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_SDCARD,
-	    "SD Controller",
+	    "SD",
 	},
 	{
 	    PCI_VENDOR_TRANSMETA, PCI_PRODUCT_TRANSMETA_NB,