From nobody Tue Dec 14 22:28:05 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EB97E18F5933; Tue, 14 Dec 2021 22:28:06 +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 4JDCgn5WFcz4cWj; Tue, 14 Dec 2021 22:28:05 +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 9504110CCF; Tue, 14 Dec 2021 22:28:05 +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 1BEMS5ll051241; Tue, 14 Dec 2021 22:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEMS5pJ051240; Tue, 14 Dec 2021 22:28:05 GMT (envelope-from git) Date: Tue, 14 Dec 2021 22:28:05 GMT Message-Id: <202112142228.1BEMS5pJ051240@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: b4fba31b633d - main - Remove references to PCMCIA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: b4fba31b633d258e70b161fd807ec86ae96f2bdc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639520886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TTlUxsakQ5ewWGP+muip+BfbZpj3glTQ0ZgPK2czHzo=; b=Gd9gzs5z5nGWYwh0wLx1fRqMz6OulWukTITMG6+5MRUQ/2bmqU3EPlBkjelTLspzRE01F2 HZqNzMiwyAUk7W7Jkx/kC6YzrWXhavvGda2Be5asK6NTMkmK5H30q6J8Hu3QtVxaOdwLGp Ro3FlOnv01FMK1HXeGejFG4Yyzrf30ccBJmnJJlKJHOWz+1Nto49ej2892hcMe6SBCpbCG 9q8L6cewV16FDp0G72QlvsQrcnhpgybTKB7oV54YbSZJTxrEeGzEWZKV2FfehLy1CUQnyV U1WtjnIZBV5v5r7D60Z7dFKA8hdD5/HmaeYnlq8bkUGzZsXafxYMpJkGXR04Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639520886; a=rsa-sha256; cv=none; b=XJWnU7OXLi78V+DplE4Kp+GVc+caM0Y726NUlLHGtaSo2J2loEp9k6KoClTNfk49ZoIO+o 56G+s4xCHbPiLLJHg27rwEZoFLs+y04xUz/1C7wT9mJQweBFbRAn1H2TDENmRZ+p/FOhaQ UA/okQrxktE0iaD9Inq3KcdVGjG9T8rWViWoul1WY8zfcKTOE7qITWr8RY0RQRfNosAND8 k+KCf2ngj8fKkmjjqRQVHdoK/PTesNK/8jRUUUkrEJKxfSyaBKqURPKEQp/FnG8U982jBz QKD4Tp2NEOP1OUyi2EDDlLXFrXkI49oF1ZSDMV+QszcQuKgh2cGtPp56BMDN1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b4fba31b633d258e70b161fd807ec86ae96f2bdc commit b4fba31b633d258e70b161fd807ec86ae96f2bdc Author: Warner Losh AuthorDate: 2021-12-14 22:07:39 +0000 Commit: Warner Losh 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