git: c0c703342d20 - main - pccard: remove pccard device from all kernels

[Warner Losh]

The branch main has been updated by imp:

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

commit c0c703342d204f63ee4da4cf05eb90f3fcfe4e8b
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-07-13 22:46:55 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-14 02:39:31 +0000

    pccard: remove pccard device from all kernels
    
    All the PC Card drivers have been removed from the tree. Remove the
    pccard drivers from all the kernels.
    
    Sponsored by:           Netflix
---
 sys/amd64/conf/GENERIC | 1 -
 sys/conf/NOTES         | 5 +----
 sys/i386/conf/GENERIC  | 1 -
 sys/mips/conf/OCTEON1  | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7ea749e28e33..a28dc238af8d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -231,7 +231,6 @@ device		agp			# support several AGP chipsets
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
 device		cbb			# cardbus (yenta) bridge
-device		pccard			# PC Card (16-bit) bus
 device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index a13882facce2..54e6dc45ac49 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1456,7 +1456,7 @@ options 	PCI_IOV			# PCI SR-IOV support
 # HARDWARE DEVICE CONFIGURATION
 
 # For ISA the required hints are listed.
-# PCI, CardBus, SD/MMC and pccard are self identifying buses, so
+# PCI, CardBus, and SD/MMC are self identifying buses, so
 # no hints are needed.
 
 #
@@ -1678,7 +1678,6 @@ device		ata
 
 # Modular ATA
 #device		atacore		# Core ATA functionality
-#device		atapccard	# CARDBUS support
 #device		ataisa		# ISA bus support
 #device		atapci		# PCI bus support; only generic chipset support
 
@@ -2171,10 +2170,8 @@ options		SND_OLDSTEREO
 # PC Card/PCMCIA and Cardbus
 #
 # cbb: pci/cardbus bridge implementing YENTA interface
-# pccard: pccard slots
 # cardbus: cardbus slots
 device		cbb
-device		pccard
 device		cardbus
 
 #
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 8f64c4b3327f..96d0803e1f2e 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -204,7 +204,6 @@ device		agp			# support several AGP chipsets
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
 device		cbb			# cardbus (yenta) bridge
-device		pccard			# PC Card (16-bit) bus
 device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports
diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
index 7596a61a09da..2ad031583d7e 100644
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@@ -133,7 +133,6 @@ device		ciss		# Compaq Smart RAID 5*
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
 device		cbb		# cardbus (yenta) bridge
-device		pccard		# PC Card (16-bit) bus
 device		cardbus		# CardBus (32-bit) bus
 
 # Serial (COM) ports