git: b4fba31b633d - main - Remove references to PCMCIA

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=b4fba31b633d258e70b161fd807ec86ae96f2bdc

commit b4fba31b633d258e70b161fd807ec86ae96f2bdc
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-12-14 22:07:39 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-12-14 22:27:47 +0000

    Remove references to PCMCIA
    
    Remove more references to PCMCIA in kernel config files. We no longer
    support PC Card devices.
    
    Sponsored by:           Netflix
---
 sys/amd64/conf/GENERIC | 5 ++---
 sys/conf/NOTES         | 6 +++---
 sys/i386/conf/GENERIC  | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 4d679e89c92d..53c6043a0146 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -226,9 +226,8 @@ device		vt_vbefb
 
 device		agp			# support several AGP chipsets
 
-# PCCARD (PCMCIA) support
-# PCMCIA and cardbus bridge support
-device		cbb			# cardbus (yenta) bridge
+# CardBus bridge support
+device		cbb			# CardBus (yenta) bridge
 device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index bdc4896ecdf1..65e088cfe7c9 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2162,10 +2162,10 @@ options		SND_PCM_64
 options		SND_OLDSTEREO
 
 #
-# PC Card/PCMCIA and Cardbus
+# Cardbus
 #
-# cbb: pci/cardbus bridge implementing YENTA interface
-# cardbus: cardbus slots
+# cbb: pci/CardBus bridge implementing YENTA interface
+# cardbus: CardBus slots
 device		cbb
 device		cardbus
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 679fc8b706f8..235713851016 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -194,9 +194,8 @@ device		vt_vbefb
 
 device		agp			# support several AGP chipsets
 
-# PCCARD (PCMCIA) support
-# PCMCIA and cardbus bridge support
-device		cbb			# cardbus (yenta) bridge
+# CardBus bridge support
+device		cbb			# CardBus (yenta) bridge
 device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports