From nobody Fri Dec 10 00:44:39 2021 X-Original-To: dev-commits-src-main@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 09F5018D19CB; Fri, 10 Dec 2021 00:44:40 +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 4J9Bxg5Stkz4cMR; Fri, 10 Dec 2021 00:44:39 +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 99DBD11404; Fri, 10 Dec 2021 00:44:39 +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 1BA0idG5013681; Fri, 10 Dec 2021 00:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA0idZK013680; Fri, 10 Dec 2021 00:44:39 GMT (envelope-from git) Date: Fri, 10 Dec 2021 00:44:39 GMT Message-Id: <202112100044.1BA0idZK013680@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: 21e22be91aa0 - main - ed: Remove options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 21e22be91aa0d77723f761b014a06f80e25e6291 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639097079; 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=LynRo6oXQ8JLKgusdqpdhNnEVInb/X8C7yYjhkFMnRw=; b=W5KZ0m7Xi+aum6VjWvKTnkL7bR71DYXZ4ARNplPqpIVnFcd1pBjt0AxenLA+b96YiS1xEP WWo/XQAAUJxYBCqk4pw8XWRU3c4Ehi7sy+NRGGeFKazUbgxie5q8DUaolYWoobnwO+NOJW 8h7dydvKcVs2U14Ce89NWCPGYea+n7BCAo3QtjOZ7U0JR7VR2w9vUKj2H1AbBlIX6WOf5j uuDL1wBMvLG8N9k1j02J5MwqiA3bcztuFWdoO/G2ErFj9SSOFho7TCDAmjyNoKurPIF65K N4hWYdfw2I57YbPvhm3JRuInTfPDk/nxhQ3GtGn6bVIr/UaXAcBD2nD/UVpwug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639097079; a=rsa-sha256; cv=none; b=LgnAGsbdi1AObhRouNqV8JmKu/Uag9hwihGjlqeXmMRau5i1+uI5vAu5RRZgxK++Ax6VAR IPqQb6vrcTgIfOCX8s0m6l9vAr/bUyZ4IsNiTgpjtQBnqu8gZ+4nM7erRvPzC/ViV5lfPI BEM3yRnbE6IkimdXXf68QHCESyO2GBqqj8cMepHokHdiWSwYYq4pvLiqVT1pomwPoJMpHN x5c/4I0PcH9S8l3tUrd7l942luE39wi5xGkfoX8gHxmxcnJExT8YQoqOqv1a8kWJUJ+SQn wKRY8byf1N22c2hH49O1vxaZvvzIOlKcj6J4KSVrq1o6r0M2JYqsgw0KNjuSSQ== 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=21e22be91aa0d77723f761b014a06f80e25e6291 commit 21e22be91aa0d77723f761b014a06f80e25e6291 Author: Warner Losh AuthorDate: 2021-12-10 00:41:39 +0000 Commit: Warner Losh CommitDate: 2021-12-10 00:41:39 +0000 ed: Remove options ed(4) was removed some time ago, but these options relevant to only it weren't GC'd at the time. Remove them. Sponsored by: Netflix --- sys/amd64/conf/NOTES | 3 --- sys/conf/options | 5 ----- sys/i386/conf/NOTES | 3 --- 3 files changed, 11 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 8cb84d6248c2..2c9c3fd7b7b6 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -307,9 +307,6 @@ device cpufreq # Requires the miibus module device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE -options ED_3C503 -options ED_HPP -options ED_SIC device igc # Intel I225 2.5G Ethernet device ipw # Intel 2100 wireless NICs. device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. diff --git a/sys/conf/options b/sys/conf/options index df856e4722fd..c66b94ce2efd 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -732,11 +732,6 @@ DEV_PFSYNC opt_pf.h DEV_SPLASH opt_splash.h DEV_VLAN opt_vlan.h -# ed driver -ED_HPP opt_ed.h -ED_3C503 opt_ed.h -ED_SIC opt_ed.h - # bce driver BCE_DEBUG opt_bce.h BCE_NVRAM_WRITE_SUPPORT opt_bce.h diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 2beab7240a68..3c1d1b8225a4 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -513,9 +513,6 @@ device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE device ce envvar hint.cs.0.at="isa" envvar hint.cs.0.port="0x300" -options ED_3C503 -options ED_HPP -options ED_SIC envvar hint.ed.0.at="isa" envvar hint.ed.0.port="0x280" envvar hint.ed.0.irq="5"