From owner-dev-commits-src-main@freebsd.org Wed Jul 14 02:39:51 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F1A3F66AB29; Wed, 14 Jul 2021 02:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GPhYM6NRgz3PPd; Wed, 14 Jul 2021 02:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC1565DCE; Wed, 14 Jul 2021 02:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16E2dpiW006631; Wed, 14 Jul 2021 02:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16E2dpBN006630; Wed, 14 Jul 2021 02:39:51 GMT (envelope-from git) Date: Wed, 14 Jul 2021 02:39:51 GMT Message-Id: <202107140239.16E2dpBN006630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c0c703342d20 - main - pccard: remove pccard device from all kernels MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0c703342d204f63ee4da4cf05eb90f3fcfe4e8b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 02:39:52 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c0c703342d204f63ee4da4cf05eb90f3fcfe4e8b commit c0c703342d204f63ee4da4cf05eb90f3fcfe4e8b Author: Warner Losh AuthorDate: 2021-07-13 22:46:55 +0000 Commit: Warner Losh 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