The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=21e22be91aa0d77723f761b014a06f80e25e6291
commit 21e22be91aa0d77723f761b014a06f80e25e6291
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2021-12-10 00:41:39 +0000
Commit: Warner Losh <i...@freebsd.org>
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"
